From 02a7efaf7d34c2ecbe5e4a367fc72c46028e5765 Mon Sep 17 00:00:00 2001 From: Glorf Date: Mon, 24 Mar 2014 19:39:34 +0100 Subject: Changes to make possible compiling in GTK3 mode. Needs --disable-caja flag set! --- shell/ev-window.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'shell/ev-window.c') diff --git a/shell/ev-window.c b/shell/ev-window.c index 6bd6fe85..8914d2e2 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -5070,14 +5070,26 @@ zoom_control_changed_cb (EphyZoomAction *action, * we must account for their sizes in calculating * the new expanded window size. */ - if (ev_window->priv->chrome & EV_CHROME_SIDEBAR) - new_width += ev_window->priv->sidebar_thumbs->allocation.width; - if (ev_window->priv->chrome & EV_CHROME_TOOLBAR) - new_height += GTK_WIDGET(ev_window->priv->toolbar)->allocation.height; + if (ev_window->priv->chrome & EV_CHROME_SIDEBAR) + { + GtkAllocation alloc; + gtk_widget_get_allocation(ev_window->priv->sidebar_thumbs, &alloc); + new_width += alloc.width; + } + if (ev_window->priv->chrome & EV_CHROME_TOOLBAR) + { + GtkAllocation alloc; + gtk_widget_get_allocation(GTK_WIDGET(ev_window->priv->toolbar), &alloc); + new_height += alloc.height; + } if (ev_window->priv->chrome & EV_CHROME_MENUBAR) - new_height += GTK_WIDGET(ev_window->priv->menubar)->allocation.height; + { + GtkAllocation alloc; + gtk_widget_get_allocation(GTK_WIDGET(ev_window->priv->menubar), &alloc); + new_height += alloc.height; + } /* * Add a little slack -- cgit v1.2.1