diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2019-05-26 21:03:04 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2019-05-26 21:03:04 +0000 |
| commit | 05bfa7a553ea605d36c34df0aec45bd61f17b978 (patch) | |
| tree | 0f7e59f20b19101e6e2d5b7756c2769068f19eaa /src/ui | |
| parent | Rm unused code now Gtk+ >= 3.22 dependency is set (diff) | |
| parent | Update it.po (diff) | |
| download | inkscape-05bfa7a553ea605d36c34df0aec45bd61f17b978.tar.gz inkscape-05bfa7a553ea605d36c34df0aec45bd61f17b978.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/toolbar/gradient-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/gradient-toolbar.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/combo-tool-item.cpp | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/ui/toolbar/gradient-toolbar.cpp b/src/ui/toolbar/gradient-toolbar.cpp index 60779f03a..afd613c83 100644 --- a/src/ui/toolbar/gradient-toolbar.cpp +++ b/src/ui/toolbar/gradient-toolbar.cpp @@ -447,7 +447,7 @@ GradientToolbar::GradientToolbar(SPDesktop *desktop) // Gradient Spread type (how a gradient is drawn outside its nominal area) { - add_label(_("Repeat")); + _spread_lbl = add_label(_("Repeat: ")); _spread_cb = Gtk::manage(new Gtk::ComboBoxText()); _spread_cb->append(C_("Gradient repeat type", "None")); @@ -461,7 +461,8 @@ GradientToolbar::GradientToolbar(SPDesktop *desktop) "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " "directions (spreadMethod=\"reflect\")")); - spread_item->set_sensitive(false); + _spread_lbl->set_sensitive(false); + _spread_cb->set_sensitive(false); spread_item->add(*_spread_cb); add(*spread_item); @@ -934,6 +935,7 @@ GradientToolbar::selection_changed(Inkscape::Selection * /*selection*/) } // Spread menu + _spread_lbl->set_sensitive( gr_selected && !gr_multi ); _spread_cb->set_sensitive( gr_selected && !gr_multi ); _spread_cb->set_active( gr_selected ? (int)spr_selected : 0 ); diff --git a/src/ui/toolbar/gradient-toolbar.h b/src/ui/toolbar/gradient-toolbar.h index f02dbdc46..40bd1acc0 100644 --- a/src/ui/toolbar/gradient-toolbar.h +++ b/src/ui/toolbar/gradient-toolbar.h @@ -23,6 +23,7 @@ class SPGradient; namespace Gtk { class ComboBoxText; class ToolButton; +class ToolItem; } namespace Inkscape { @@ -44,6 +45,7 @@ private: std::vector<Gtk::RadioToolButton *> _new_type_buttons; std::vector<Gtk::RadioToolButton *> _new_fillstroke_buttons; UI::Widget::ComboToolItem *_select_cb; + Gtk::ToolItem *_spread_lbl; Gtk::ComboBoxText *_spread_cb; UI::Widget::ComboToolItem *_stop_cb; diff --git a/src/ui/widget/combo-tool-item.cpp b/src/ui/widget/combo-tool-item.cpp index eb26e5c6e..a6c44f7eb 100644 --- a/src/ui/widget/combo-tool-item.cpp +++ b/src/ui/widget/combo-tool-item.cpp @@ -100,12 +100,6 @@ ComboToolItem::ComboToolItem(Glib::ustring group_label, void ComboToolItem::set_active (gint active) { - - if (active < 0) { - std::cerr << "ComboToolItem::set_active: active < 0: " << active << std::endl; - return; - } - if (_active != active) { _active = active; @@ -176,7 +170,6 @@ void ComboToolItem::on_changed_combobox() { int row = _combobox->get_active_row_number(); - if (row < 0) row = 0; // Happens when Gtk::ListStore reconstructed set_active( row ); _changed.emit (_active); _changed_after.emit (_active); |