summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-05-24 00:54:12 -0500
committerTimothy Pearson <[email protected]>2012-05-24 00:54:12 -0500
commit5065da01ed2812708592345674ffcf6a2b43e002 (patch)
tree924d82f5e7d23173811bcb1d90e5c2c4a6d57402 /src
parentcf76cd3b442100a074ffcee2dc2162ad53b5f53b (diff)
downloadtqt3-5065da01ed2812708592345674ffcf6a2b43e002.tar.gz
tqt3-5065da01ed2812708592345674ffcf6a2b43e002.zip
Automated update from Qt3
Diffstat (limited to 'src')
-rw-r--r--src/kernel/qapplication_x11.cpp41
1 files changed, 21 insertions, 20 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 0dbd6ce78..b3bf9b7f2 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -3462,6 +3462,27 @@ int TQApplication::x11ProcessEvent( XEvent* event )
return 0;
}
+#ifndef QT_NO_XRANDR
+ // XRandR doesn't care if TQt doesn't know about the widget, so handle XRandR stuff before the !widget check below
+ if (event->type == xrandr_eventbase + RRScreenChangeNotify
+ || ( event->type == ConfigureNotify && event->xconfigure.window == TQPaintDevice::x11AppRootWindow())) {
+ // update Xlib internals with the latest screen configuration
+ XRRUpdateConfiguration(event);
+
+ // update the size for desktop widget
+ int scr = XRRRootToScreen( appDpy, event->xany.window );
+ TQWidget *w = desktop()->screen( scr );
+ TQSize oldSize( w->size() );
+ w->crect.setWidth( DisplayWidth( appDpy, scr ) );
+ w->crect.setHeight( DisplayHeight( appDpy, scr ) );
+ if ( w->size() != oldSize ) {
+ TQResizeEvent e( w->size(), oldSize );
+ TQApplication::sendEvent( w, &e );
+ emit desktop()->resized( scr );
+ }
+ }
+#endif // QT_NO_XRANDR
+
if ( !widget ) { // don't know this windows
TQWidget* popup = TQApplication::activePopupWidget();
if ( popup ) {
@@ -3512,26 +3533,6 @@ int TQApplication::x11ProcessEvent( XEvent* event )
}
#endif
-#ifndef QT_NO_XRANDR
- if (event->type == xrandr_eventbase + RRScreenChangeNotify
- || ( event->type == ConfigureNotify && event->xconfigure.window == TQPaintDevice::x11AppRootWindow())) {
- // update Xlib internals with the latest screen configuration
- XRRUpdateConfiguration(event);
-
- // update the size for desktop widget
- int scr = XRRRootToScreen( appDpy, event->xany.window );
- TQWidget *w = desktop()->screen( scr );
- TQSize oldSize( w->size() );
- w->crect.setWidth( DisplayWidth( appDpy, scr ) );
- w->crect.setHeight( DisplayHeight( appDpy, scr ) );
- if ( w->size() != oldSize ) {
- TQResizeEvent e( w->size(), oldSize );
- TQApplication::sendEvent( w, &e );
- emit desktop()->resized( scr );
- }
- }
-#endif // QT_NO_XRANDR
-
switch ( event->type ) {
case ButtonRelease: // mouse event