X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fwindow.cpp;h=c8671a2fbcf0ab25976c5658d26a02d6abf87e44;hb=484defd6cf1148d020be9d3e548870ab85181b37;hp=80b79738892daabe2590316fc95c1cfa999fa3ba;hpb=2f3b74eff8ba0ca83d3f7d14fe11f93483d22c89;p=xonotic%2Fnetradiant.git diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp index 80b79738..c8671a2f 100644 --- a/libs/gtkutil/window.cpp +++ b/libs/gtkutil/window.cpp @@ -39,6 +39,15 @@ inline void CHECK_RESTORE( ui::Widget w ){ #endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET w.show(); +#define GARUX_GTK_WORKAROUND +#ifndef GARUX_GTK_WORKAROUND + /* workaround for gtk 2.24 issue: not displayed glwidget after min/restore */ + GtkWidget* glwidget = GTK_WIDGET( g_object_get_data( G_OBJECT( w ), "glwidget" ) ); + if ( glwidget ){ + gtk_widget_hide( glwidget ); + gtk_widget_show( glwidget ); + } +#endif } } @@ -119,6 +128,23 @@ ui::Window create_floating_window( const char* title, ui::Window parent ){ connect_floating_window_destroy_present( window, parent ); g_object_set_data( G_OBJECT( window ), "floating_handler", gint_to_pointer( connect_floating( parent, window ) ) ); window.connect( "destroy", G_CALLBACK( destroy_disconnect_floating ), parent ); +/* + //gtk_window_set_type_hint (window,GDK_WINDOW_TYPE_HINT_UTILITY); + //gtk_window_set_type_hint (window,GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_window_set_keep_above ( window, TRUE ); + GtkWidget* widget = GTK_WIDGET( window ); + gtk_widget_realize ( widget ); + GdkWindow* gdk_window = gtk_widget_get_window( widget ); + //gdk_window_set_decorations ( gdk_window, (GdkWMDecoration)(GDK_DECOR_BORDER|GDK_DECOR_RESIZEH|GDK_DECOR_TITLE|GDK_DECOR_MENU|GDK_DECOR_MINIMIZE|GDK_DECOR_MAXIMIZE) ); + //gdk_window_set_functions ( gdk_window, (GdkWMFunction)( GDK_FUNC_RESIZE|GDK_FUNC_MOVE|GDK_FUNC_MINIMIZE|GDK_FUNC_MAXIMIZE|GDK_FUNC_CLOSE ) ); + //gdk_window_set_decorations ( gdk_window, (GdkWMDecoration)( GDK_DECOR_ALL ) ); + //gdk_window_set_functions ( gdk_window, (GdkWMFunction)( GDK_FUNC_ALL ) ); + //gdk_window_set_type_hint ( gdk_window, GDK_WINDOW_TYPE_HINT_DIALOG ); + //gdk_window_set_type_hint ( gdk_window, GDK_WINDOW_TYPE_HINT_UTILITY ); + //gdk_window_set_type_hint ( gdk_window, GDK_WINDOW_TYPE_HINT_NORMAL ); + gdk_window_set_skip_taskbar_hint ( gdk_window, TRUE ); + gdk_window_set_skip_pager_hint ( gdk_window, TRUE ); +*/ } return window;