Differential D11795 Diff 31443 lib/documentview/documentviewcontainer.cpp

Changeset View

Standalone View

View Options

lib/documentview/documentviewcontainer.cpp

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)
114DocumentViewContainer::~DocumentViewContainer() 114​DocumentViewContainer::~DocumentViewContainer()
115{ 115​{
116 delete d; 116​ delete d;
117} 117​}
118 118​
119DocumentView* DocumentViewContainer::createView() 119​DocumentView* DocumentViewContainer::createView()
120{ 120​{
121 DocumentView* view = new DocumentView(d->mScene); 121​ DocumentView* view = new DocumentView(d->mScene);
122​ view->setPalette(palette());
122 d->mAddedViews << view; 123​ d->mAddedViews << view;
123 view->show(); 124​ view->show();
124 connect(view, &DocumentView::fadeInFinished, this, &DocumentViewContainer::slotFadeInFinished); 125​ connect(view, &DocumentView::fadeInFinished, this, &DocumentViewContainer::slotFadeInFinished);
125 d->scheduleLayoutUpdate(); 126​ d->scheduleLayoutUpdate();
126 return view; 127​ return view;
127} 128​}
128 129​
129void DocumentViewContainer::deleteView(DocumentView* view) 130​void DocumentViewContainer::deleteView(DocumentView* view)
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)174{
180 bool animated = GwenviewConfig::animationMethod() != DocumentView::NoAnimation; 181​ bool animated = GwenviewConfig::animationMethod() != DocumentView::NoAnimation;
181 bool crossFade = d->mAddedViews.count() == 1 && d->mRemovedViews.count() == 1; 182​ bool crossFade = d->mAddedViews.count() == 1 && d->mRemovedViews.count() == 1;
182 183​
183 if (animated && crossFade) { 184​ if (animated && crossFade) {
184 DocumentView* oldView = *d->mRemovedViews.begin(); 185​ DocumentView* oldView = *d->mRemovedViews.begin();
185 DocumentView* newView = *d->mAddedViews.begin(); 186​ DocumentView* newView = *d->mAddedViews.begin();
186 187​
187 newView->setGeometry(rect()); 188​ newView->setGeometry(rect());
188 newView->setEraseBorders(true); ​
189 QPropertyAnimation* anim = newView->fadeIn(); 189​ QPropertyAnimation* anim = newView->fadeIn();
190 190​
191 oldView->setZValue(-1); 191​ oldView->setZValue(-1);
192 connect(anim, &QPropertyAnimation::finished, oldView, &DocumentView::hideAndDeleteLater); 192​ connect(anim, &QPropertyAnimation::finished, oldView, &DocumentView::hideAndDeleteLater);
193 d->mRemovedViews.clear(); 193​ d->mRemovedViews.clear();
194 194​
195 return; 195​ return;
196 } 196​ }
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)241 if (d->mViews.contains(view)) {
251 } 251​ }
252 } else { 252​ } else {
253 view->setGeometry(rect); 253​ view->setGeometry(rect);
254 view->fadeIn(); 254​ view->fadeIn();
255 } 255​ }
256 } else { 256​ } else {
257 // Not animated, set final geometry and opacity now 257​ // Not animated, set final geometry and opacity now
258 view->setGeometry(rect); 258​ view->setGeometry(rect);
259 view->setOpacity(1); 259​ // Assumes opacity set using QGraphicsOpacityEffect, and not the opacity() property
260​ view->setGraphicsEffect(0);
260 } 261​ }
261 262​
262 ++col; 263​ ++col;
263 if (col == colCount) { 264​ if (col == colCount) {
264 col = 0; 265​ col = 0;
265 ++row; 266​ ++row;
266 } 267​ }
267 } 268​ }
Show All 27 Lines
295{ 296​{
296 if (!d->mAddedViews.contains(view)) { 297​ if (!d->mAddedViews.contains(view)) {
297 // This can happen if user goes to next image then quickly goes to the 298​ // This can happen if user goes to next image then quickly goes to the
298 // next one before the animation is finished. 299​ // next one before the animation is finished.
299 return; 300​ return;
300 } 301​ }
301 d->mAddedViews.remove(view); 302​ d->mAddedViews.remove(view);
302 d->mViews.insert(view); 303​ d->mViews.insert(view);
303 view->setEraseBorders(false); ​
304} 304​}
305 305​
306void DocumentViewContainer::slotConfigChanged() 306​void DocumentViewContainer::slotConfigChanged()
307{ 307​{
308 bool currentlyGL = qobject_cast<QGLWidget*>(viewport()); 308​ bool currentlyGL = qobject_cast<QGLWidget*>(viewport());
309 bool wantGL = GwenviewConfig::animationMethod() == DocumentView::GLAnimation; 309​ bool wantGL = GwenviewConfig::animationMethod() == DocumentView::GLAnimation;
310 if (currentlyGL != wantGL) { 310​ if (currentlyGL != wantGL) {
311 setViewport(wantGL ? new QGLWidget() : new QWidget()); 311​ setViewport(wantGL ? new QGLWidget() : new QWidget());
Show All 14 Lines316{
326 widget->setParentItem(view); 326​ widget->setParentItem(view);
327 GraphicsWidgetFloater* floater = new GraphicsWidgetFloater(view); 327​ GraphicsWidgetFloater* floater = new GraphicsWidgetFloater(view);
328 floater->setChildWidget(widget); 328​ floater->setChildWidget(widget);
329 floater->setAlignment(align); 329​ floater->setAlignment(align);
330 widget->show(); 330​ widget->show();
331 widget->setZValue(1); 331​ widget->setZValue(1);
332} 332​}
333 333​
334​void DocumentViewContainer::applyPalette(const QPalette& palette)
335​{
336​ setPalette(palette);
337​ for (DocumentView* view : d->mViews | d->mAddedViews) {
rkflxUnsubmitted
Done

Please don't use Q_FOREACH for new code, see https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH.

rkflx: Please don't use `Q_FOREACH` for new code, see https://doc.qt.io/qt-5/qtglobal.html#Q_FOREACH.
rkflxUnsubmitted
Done

Would this also work without (…).toList()?

rkflx: Would this also work without `(…).toList()`?
rkflxUnsubmitted
Done

…and without the braces? (At least to me the operator precedence it pretty clear here.)

rkflx: …and without the braces? (At least to me the operator precedence it pretty clear here.)
huoniAuthorUnsubmitted
Not Done

I usually prefer being explicit than relying on operator precedence, but in this case there's really no other way to interpret it!

huoni: I usually prefer being explicit than relying on operator precedence, but in this case there's…
338​ view->setPalette(palette);
339​ }
340​}
341​
334} // namespace 342​} // namespace