diff options
Diffstat (limited to 'gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch')
| -rw-r--r-- | gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch b/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch new file mode 100644 index 000000000..980268dea --- /dev/null +++ b/gentoo/dev-qt/qt/files/trinity-3.5.13.1..3.5.13.2/qt3-2013-01-13_02_45_04-Verify-desktop-widget-screen-number-before-applying-size-changes-This-resolves-Bug-1378-b8ca17c.patch @@ -0,0 +1,38 @@ +diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp +index 203cb39..4a03d95 100644 +--- a/src/kernel/qapplication_x11.cpp ++++ b/src/kernel/qapplication_x11.cpp +@@ -3446,13 +3446,26 @@ int QApplication::x11ProcessEvent( XEvent* event ) + // update the size for desktop widget + int scr = XRRRootToScreen( appDpy, event->xany.window ); + QWidget *w = desktop()->screen( scr ); +- QSize oldSize( w->size() ); +- w->crect.setWidth( DisplayWidth( appDpy, scr ) ); +- w->crect.setHeight( DisplayHeight( appDpy, scr ) ); +- if ( w->size() != oldSize ) { +- QResizeEvent e( w->size(), oldSize ); +- QApplication::sendEvent( w, &e ); +- emit desktop()->resized( scr ); ++ ++ if (w) { ++ int widgetScr = -1; ++ // make sure the specified widget is on the same screen that received the XRandR event ++ XWindowAttributes widgetAttr; ++ XGetWindowAttributes(appDpy, w->winId(), &widgetAttr); ++ if (widgetAttr.screen) { ++ widgetScr = XScreenNumberOfScreen(widgetAttr.screen); ++ } ++ ++ if ((widgetScr < 0) || (widgetScr == scr)) { ++ QSize oldSize( w->size() ); ++ w->crect.setWidth( DisplayWidth( appDpy, scr ) ); ++ w->crect.setHeight( DisplayHeight( appDpy, scr ) ); ++ if ( w->size() != oldSize ) { ++ QResizeEvent e( w->size(), oldSize ); ++ QApplication::sendEvent( w, &e ); ++ emit desktop()->resized( scr ); ++ } ++ } + } + } + #endif // QT_NO_XRANDR |