spell out Fill and Stroke labels

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 851ddc78d3612653b68e927a21e417dfc356dc3d..eca474ea78bf9ca772d2a5021d9f1c6d246b1f8e 100644 (file)
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -89,8 +89,8 @@ SelectedStyle::SelectedStyle(bool layout)
     : _desktop (NULL),
 
       _table(2, 6),
-      _fill_label (_("F:")),
-      _stroke_label (_("S:")),
+      _fill_label (_("Fill:")),
+      _stroke_label (_("Stroke:")),
       _opacity_label (_("O:")),
       _fill_place (),
       _stroke_place (),
@@ -319,8 +319,8 @@ SelectedStyle::SelectedStyle(bool layout)
     _opacity_sb.set_size_request (SELECTED_STYLE_SB_WIDTH, -1);
     _opacity_sb.set_sensitive (false);
 
-    _table.attach(_fill_label, 0,1, 0,1, Gtk::SHRINK, Gtk::SHRINK);
-    _table.attach(_stroke_label, 0,1, 1,2, Gtk::SHRINK, Gtk::SHRINK);
+    _table.attach(_fill_label, 0,1, 0,1, Gtk::FILL, Gtk::SHRINK);
+    _table.attach(_stroke_label, 0,1, 1,2, Gtk::FILL, Gtk::SHRINK);
 
     _table.attach(_fill_flag_place, 1,2, 0,1, Gtk::SHRINK, Gtk::SHRINK);
     _table.attach(_stroke_flag_place, 1,2, 1,2, Gtk::SHRINK, Gtk::SHRINK);

diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h
index c3290a8e2bb115c861801b310c71cfc8874003f0..c63890bd00bf169e0514789d9f29e76cde3ab3a7 100644 (file)
--- a/src/widgets/widget-sizes.h
+++ b/src/widgets/widget-sizes.h
@@ -30,8 +30,8 @@
 #define STATUS_ZOOM_WIDTH 57
 
 #define SELECTED_STYLE_SB_WIDTH 38
-#define SELECTED_STYLE_WIDTH 150
-#define STYLE_SWATCH_WIDTH 80
+#define SELECTED_STYLE_WIDTH 180
+#define STYLE_SWATCH_WIDTH 100
 
 #define STATUS_LAYER_FONT_SIZE 7700