[Freeciv-Dev] Re: (PR#8820) gtk2: detachable panels go behind the main window

["andrearo@xxxxxxxxxxxx" <andrearo@xxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=8820 >

On Sun, 23 May 2004, andrearo@xxxxxxxxxxxx wrote:
> On Sun, 23 May 2004, Jason Short wrote:
> > In gui-gtk-2.0, if you detach the panel and then click on the main
> > window anywhere the panel window will go behind the main window.  This
> > is quite problematic if you're in fullscreen mode.
>
> This is what happens if you don't use setup_dialog() on all widgets.
> In PR#8486 (fullscreen patch), I must have forgotten to add the detachable
> windows. I'll check if some other widgets are forgotten..

Here's a fix for the detachable panes, and some in the connection dialog.

Andreas Røsdal

diff -ruN -Xfreeciv-cvs-May-23/diff_ignore 
freeciv-cvs-May-23/client/gui-gtk-2.0/connectdlg.c 
freeciv-fullscreen-fix-1/client/gui-gtk-2.0/connectdlg.c
--- freeciv-cvs-May-23/client/gui-gtk-2.0/connectdlg.c  2004-05-12 
07:12:28.000000000 +0200
+++ freeciv-fullscreen-fix-1/client/gui-gtk-2.0/connectdlg.c    2004-05-24 
14:06:03.375028395 +0200
@@ -537,6 +537,7 @@
   
   /* Create the selector */
   filesel = gtk_file_selection_new(title);
+  setup_dialog(filesel, toplevel);
   gtk_window_set_position(GTK_WINDOW(filesel), GTK_WIN_POS_MOUSE);
    
   if (current_filename) {
diff -ruN -Xfreeciv-cvs-May-23/diff_ignore 
freeciv-cvs-May-23/client/gui-gtk-2.0/gui_main.c 
freeciv-fullscreen-fix-1/client/gui-gtk-2.0/gui_main.c
--- freeciv-cvs-May-23/client/gui-gtk-2.0/gui_main.c    2004-05-02 
07:12:07.000000000 +0200
+++ freeciv-fullscreen-fix-1/client/gui-gtk-2.0/gui_main.c      2004-05-24 
13:53:41.000000000 +0200
@@ -523,6 +523,7 @@
 
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b))) {
     w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    setup_dialog(w, toplevel);
     gtk_widget_set_name(w, "Freeciv");
     gtk_window_set_title(GTK_WINDOW(w), _("Freeciv"));
     gtk_window_set_position(GTK_WINDOW(w), GTK_WIN_POS_MOUSE);
diff -ruN -Xfreeciv-cvs-May-23/diff_ignore 
freeciv-cvs-May-23/client/gui-gtk-2.0/repodlgs.c 
freeciv-fullscreen-fix-1/client/gui-gtk-2.0/repodlgs.c
--- freeciv-cvs-May-23/client/gui-gtk-2.0/repodlgs.c    2004-05-12 
07:12:28.000000000 +0200
+++ freeciv-fullscreen-fix-1/client/gui-gtk-2.0/repodlgs.c      2004-05-24 
14:11:51.504735864 +0200
@@ -1493,6 +1493,7 @@
 
   tips = gtk_tooltips_new();
   win = gtk_dialog_new();
+  setup_dialog(win, toplevel);
   gtk_window_set_title(GTK_WINDOW(win), _("Server Options"));
   gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_MOUSE);