summaryrefslogtreecommitdiffstats
path: root/src/widgets/stroke-marker-selector.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-09-25 20:41:04 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-09-25 20:41:04 +0000
commit10f49c2924837a6b429b2ad7d41deb1a400cc913 (patch)
tree72c2781995a3666454e51043b713683501283bea /src/widgets/stroke-marker-selector.cpp
parentChanges from 2012-09-24 (diff)
parentDoc. Shapes tutorial update (see Bug #817907 - Linked offsets regression). (diff)
downloadinkscape-10f49c2924837a6b429b2ad7d41deb1a400cc913.tar.gz
inkscape-10f49c2924837a6b429b2ad7d41deb1a400cc913.zip
merge from trunk (r11704)
(bzr r11668.1.14)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
-rw-r--r--src/widgets/stroke-marker-selector.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 206f166f9..62fa47603 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -57,8 +57,8 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) :
set_model(marker_store);
pack_start(image_renderer, false);
pack_end(label_renderer, true);
- label_renderer.set_padding(5, 0);
- image_renderer.set_padding(5, 0);
+ label_renderer.set_padding(2, 0);
+ image_renderer.set_padding(2, 0);
set_cell_data_func(label_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareLabelRenderer));
set_cell_data_func(image_renderer, sigc::mem_fun(*this, &MarkerComboBox::prepareImageRenderer));
gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(gobj()), MarkerComboBox::separator_cb, NULL, NULL);
@@ -562,6 +562,7 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname,
void MarkerComboBox::prepareLabelRenderer( Gtk::TreeModel::const_iterator const &row ) {
Glib::ustring name=(*row)[marker_columns.label];
label_renderer.property_markup() = name.c_str();
+ label_renderer.property_scale() = 0.8;
}
void MarkerComboBox::prepareImageRenderer( Gtk::TreeModel::const_iterator const &row ) {