[glade] Fixed window docks regresion bug.
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Fixed window docks regresion bug.
- Date: Mon, 4 Mar 2013 17:55:01 +0000 (UTC)
commit 607afc3cd1aabc9b971923378951e74830162db0
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Mon Mar 4 14:53:04 2013 -0300
Fixed window docks regresion bug.
src/glade-window.c | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/src/glade-window.c b/src/glade-window.c
index 2668dc6..8b10cd5 100644
--- a/src/glade-window.c
+++ b/src/glade-window.c
@@ -2862,13 +2862,6 @@ glade_window_config_load (GladeWindow *window)
glade_preferences_config_load (window->priv->preferences, config);
}
-static gboolean
-raise_window_idle (GtkWindow *window)
-{
- gtk_window_present (window);
- return FALSE;
-}
-
static void
show_dock_first_time (GladeWindow *window, guint dock_type, GtkAction *action)
{
@@ -2886,12 +2879,8 @@ show_dock_first_time (GladeWindow *window, guint dock_type, GtkAction *action)
key_file_get_window_position (config, dock->id, &dock->window_pos, &detached,
&maximized);
- if (detached == 1)
- {
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
-
- g_idle_add ((GSourceFunc)raise_window_idle, gtk_widget_get_toplevel (dock->widget));
- }
+ if (detached)
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE);
if (maximized)
gtk_window_maximize (GTK_WINDOW (gtk_widget_get_toplevel (dock->widget)));
@@ -3075,9 +3064,6 @@ glade_window_constructed (GObject *object)
_("Inspector"), "inspector", priv->right_pane, TRUE);
setup_dock (&priv->docks[DOCK_EDITOR], GTK_WIDGET (priv->editor), 500, 700,
_("Properties"), "properties", priv->right_pane, FALSE);
- show_dock_first_time (window, DOCK_PALETTE, GET_OBJECT (builder, GTK_ACTION, "dock_palette_action"));
- show_dock_first_time (window, DOCK_INSPECTOR, GET_OBJECT (builder, GTK_ACTION, "dock_inspector_action"));
- show_dock_first_time (window, DOCK_EDITOR, GET_OBJECT (builder, GTK_ACTION, "dock_editor_action"));
/* status bar */
priv->statusbar_menu_context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar), "menu");
@@ -3147,6 +3133,11 @@ glade_window_constructed (GObject *object)
gtk_osxapplication_ready(theApp);
}
#endif
+
+ show_dock_first_time (window, DOCK_PALETTE, GET_OBJECT (builder, GTK_ACTION, "dock_palette_action"));
+ show_dock_first_time (window, DOCK_INSPECTOR, GET_OBJECT (builder, GTK_ACTION, "dock_inspector_action"));
+ show_dock_first_time (window, DOCK_EDITOR, GET_OBJECT (builder, GTK_ACTION, "dock_editor_action"));
+
g_object_unref (builder);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]