diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-10-03 07:43:30 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-10-03 07:43:30 +0000 |
| commit | e36c124c67c8748f567a1f069e211ff5bfc987fb (patch) | |
| tree | 9abba44e3846c5433c8aeb12478d4fa1ada3505e /src | |
| parent | Fix for 602698 : Add Android palette (diff) | |
| download | inkscape-e36c124c67c8748f567a1f069e211ff5bfc987fb.tar.gz inkscape-e36c124c67c8748f567a1f069e211ff5bfc987fb.zip | |
Fix for 687655 : New color wheel should not increase the width of docked Fill&Stroke dialog when scaled
(bzr r11729)
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/sp-color-wheel-selector.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp index 4cc9f9e4a..bb8bba328 100644 --- a/src/widgets/sp-color-wheel-selector.cpp +++ b/src/widgets/sp-color-wheel-selector.cpp @@ -109,7 +109,8 @@ static void resizeHSVWheel( GtkHSV *hsv, GtkAllocation *allocation ) gint diam = std::min(allocation->width, allocation->height); // drop a little for resizing - diam -= 4; + // This magic number stops the dialog expanding in width when resizing height + diam -= 16; GtkStyle *style = gtk_widget_get_style( GTK_WIDGET(hsv) ); if ( style ) { @@ -161,7 +162,7 @@ void ColorWheelSelector::init() _wheel = gtk_hsv_new(); gtk_hsv_set_metrics( GTK_HSV(_wheel), 48, 8 ); gtk_widget_show( _wheel ); - gtk_table_attach( GTK_TABLE(t), _wheel, 0, 3, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), XPAD, YPAD); + gtk_table_attach( GTK_TABLE(t), _wheel, 0, 3, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0); row++; |