summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2018-08-09 14:00:05 +0000
committerJabiertxof <jabier.arraiza@marker.es>2018-08-09 14:00:05 +0000
commit09bce9d404f03608fc51e87a8d06f6ac30b0db10 (patch)
treeb2937d4c7df5de81601d61972d1831fc1dd5964a
parentFix 2 symbolic icons (diff)
downloadinkscape-09bce9d404f03608fc51e87a8d06f6ac30b0db10.tar.gz
inkscape-09bce9d404f03608fc51e87a8d06f6ac30b0db10.zip
Fix bug pointed by moini in https://gitlab.com/inkscape/inkscape/merge_requests/294#note_93146271
-rw-r--r--share/ui/style.css19
-rw-r--r--src/widgets/dash-selector.cpp1
-rw-r--r--src/widgets/dash-selector.h2
-rw-r--r--src/widgets/stroke-marker-selector.cpp2
4 files changed, 21 insertions, 3 deletions
diff --git a/share/ui/style.css b/share/ui/style.css
index 9593cfcea..8aee47484 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -170,4 +170,21 @@ combobox window.popup scrolledwindow treeview separator {
spinbutton undershoot {
outline-style : none;
-} \ No newline at end of file
+}
+
+#dashCombo button{
+ background-image:image(rgb(230,230,230));
+ color:rgb(0,0,0);
+}
+#dashCombo menu{
+ background-image:image(rgb(230,230,230));
+ color:rgb(0,0,0);
+}
+#markerCombo button{
+ background-image:image(rgb(230,230,230));
+ color:rgb(0,0,0);
+}
+#markerCombo menu{
+ background-image:image(rgb(230,230,230));
+ color:rgb(0,0,0);
+}
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 3f1c91dc3..b2401fa93 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -60,6 +60,7 @@ SPDashSelector::SPDashSelector()
dash_combo.pack_start(image_renderer);
dash_combo.set_cell_data_func(image_renderer, sigc::mem_fun(*this, &SPDashSelector::prepareImageRenderer));
dash_combo.set_tooltip_text(_("Dash pattern"));
+ dash_combo.set_name("dashCombo");
dash_combo.show();
dash_combo.signal_changed().connect( sigc::mem_fun(*this, &SPDashSelector::on_selection) );
diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
index 2e59c5948..3e22866b4 100644
--- a/src/widgets/dash-selector.h
+++ b/src/widgets/dash-selector.h
@@ -83,7 +83,7 @@ private:
};
DashColumns dash_columns;
Glib::RefPtr<Gtk::ListStore> dash_store;
- Gtk::ComboBox dash_combo;
+ Gtk::ComboBox dash_combo;
Gtk::CellRendererPixbuf image_renderer;
Glib::RefPtr<Gtk::Adjustment> offset;
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index dfa8614a1..006589a33 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -55,7 +55,7 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) :
pack_start(image_renderer, false);
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, nullptr, nullptr);
-
+ gtk_widget_set_name(GTK_WIDGET(gobj()), "markerCombo");
empty_image = sp_get_icon_image("no-marker", Gtk::ICON_SIZE_SMALL_TOOLBAR);
sandbox = ink_markers_preview_doc ();