summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2016-10-02 03:14:55 +0000
committerMartin Owens <doctormo@gmail.com>2016-10-02 03:14:55 +0000
commitb6ec8d66b6ba6889217dfb0cbff4fd3c9901acd2 (patch)
treebb7a8c53e1543342fe5820f8c9ba6f05a688cd48 /src
parentAdd a prune method to saving svg files that removes Adobe's i:pgf tag. (diff)
downloadinkscape-b6ec8d66b6ba6889217dfb0cbff4fd3c9901acd2.tar.gz
inkscape-b6ec8d66b6ba6889217dfb0cbff4fd3c9901acd2.zip
Adjust dock size to minimum width during canvas table size allocation signal.
(bzr r15142)
Diffstat (limited to 'src')
-rw-r--r--src/widgets/desktop-widget.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index bd72560c6..55dc82dc0 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -307,12 +307,19 @@ sp_desktop_widget_class_init (SPDesktopWidgetClass *klass)
* This adjusts the range of the rulers when the dock container is adjusted
* (fixes lp:950552)
*/
-static void canvas_tbl_size_allocate(GtkWidget * /*widget*/,
+static void canvas_tbl_size_allocate(GtkWidget * widget,
GdkRectangle * /*allocation*/,
gpointer data)
{
SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data);
sp_desktop_widget_update_rulers(dtw);
+
+ GtkWidget* parent = gtk_widget_get_parent(widget);
+ if(GTK_IS_PANED(parent)) {
+ GtkPaned *paned = GTK_PANED(parent);
+ // Could use gtk paned property 'max-position' here
+ gtk_paned_set_position(paned, 10000);
+ }
}
/**
@@ -527,8 +534,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
paned_class->cycle_handle_focus = NULL;
}
- gtk_widget_set_hexpand(GTK_WIDGET(paned->gobj()), TRUE);
- gtk_widget_set_vexpand(GTK_WIDGET(paned->gobj()), TRUE);
+ paned->set_hexpand(true);
+ paned->set_vexpand(true);
gtk_grid_attach(GTK_GRID(tbl_wrapper), GTK_WIDGET (paned->gobj()), 1, 1, 1, 1);
} else {
gtk_widget_set_hexpand(GTK_WIDGET(dtw->canvas_tbl), TRUE);