From 5cdccb81fe138a9199f87dfcd0d19d0b5478c181 Mon Sep 17 00:00:00 2001 From: Adam Belis Date: Sun, 2 May 2021 14:24:04 +0000 Subject: [PATCH 1/2] Increase text tool fields limits --- src/ui/toolbar/text-toolbar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index 3e211d9f078..b2f7d3325f6 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -339,7 +339,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector values = { 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 2.0}; auto line_height_val = 1.25; - _line_height_adj = Gtk::Adjustment::create(line_height_val, 0.0, 1000.0, 0.1, 1.0); + _line_height_adj = Gtk::Adjustment::create(line_height_val, 0.0, 100000.0, 0.1, 1.0); _line_height_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-line-height", "", _line_height_adj, 0.1, 2)); _line_height_item->set_tooltip_text(_("Spacing between baselines")); @@ -436,7 +436,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector labels = {_("Negative spacing"), "", "", "", C_("Text tool", "Normal"), "", "", "", "", "", "", "", _("Positive spacing")}; std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0}; auto letter_spacing_val = prefs->getDouble("/tools/text/letterspacing", 0.0); - _letter_spacing_adj = Gtk::Adjustment::create(letter_spacing_val, -100.0, 1000.0, 0.01, 0.10); + _letter_spacing_adj = Gtk::Adjustment::create(letter_spacing_val, -100000.0, 100000.0, 0.01, 0.10); _letter_spacing_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-letter-spacing", _("Letter:"), _letter_spacing_adj, 0.1, 2)); _letter_spacing_item->set_tooltip_text(_("Spacing between letters (px)")); _letter_spacing_item->set_custom_numeric_menu_data(values, labels); @@ -454,7 +454,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector labels = {_("Negative spacing"), "", "", "", C_("Text tool", "Normal"), "", "", "", "", "", "", "", _("Positive spacing")}; std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0}; auto word_spacing_val = prefs->getDouble("/tools/text/wordspacing", 0.0); - _word_spacing_adj = Gtk::Adjustment::create(word_spacing_val, -100.0, 1000.0, 0.01, 0.10); + _word_spacing_adj = Gtk::Adjustment::create(word_spacing_val, -100000.0, 100000.0, 0.01, 0.10); _word_spacing_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-word-spacing", _("Word:"), _word_spacing_adj, 0.1, 2)); _word_spacing_item->set_tooltip_text(_("Spacing between words (px)")); _word_spacing_item->set_custom_numeric_menu_data(values, labels); @@ -471,7 +471,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) // Drop down menu std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5 }; auto dx_val = prefs->getDouble("/tools/text/dx", 0.0); - _dx_adj = Gtk::Adjustment::create(dx_val, -100.0, 1000.0, 0.01, 0.1); + _dx_adj = Gtk::Adjustment::create(dx_val, -100000.0, 100000.0, 0.01, 0.1); _dx_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-dx", _("Kern:"), _dx_adj, 0.1, 2)); _dx_item->set_custom_numeric_menu_data(values); _dx_item->set_tooltip_text(_("Horizontal kerning (px)")); @@ -487,7 +487,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) // Drop down menu std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5 }; auto dy_val = prefs->getDouble("/tools/text/dy", 0.0); - _dy_adj = Gtk::Adjustment::create(dy_val, -100.0, 1000.0, 0.01, 0.1); + _dy_adj = Gtk::Adjustment::create(dy_val, -100000.0, 100000.0, 0.01, 0.1); _dy_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-dy", _("Vert:"), _dy_adj, 0.1, 2)); _dy_item->set_tooltip_text(_("Vertical kerning (px)")); _dy_item->set_custom_numeric_menu_data(values); -- GitLab From b49bb2e51ca46972e32c903565254610b1d937d8 Mon Sep 17 00:00:00 2001 From: Adam Belis Date: Mon, 3 May 2021 11:57:38 +0000 Subject: [PATCH 2/2] decrease back to 1000 --- src/ui/toolbar/text-toolbar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index b2f7d3325f6..ec2f0ae1684 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -339,7 +339,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector values = { 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 2.0}; auto line_height_val = 1.25; - _line_height_adj = Gtk::Adjustment::create(line_height_val, 0.0, 100000.0, 0.1, 1.0); + _line_height_adj = Gtk::Adjustment::create(line_height_val, 0.0, 1000.0, 0.1, 1.0); _line_height_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-line-height", "", _line_height_adj, 0.1, 2)); _line_height_item->set_tooltip_text(_("Spacing between baselines")); @@ -436,7 +436,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector labels = {_("Negative spacing"), "", "", "", C_("Text tool", "Normal"), "", "", "", "", "", "", "", _("Positive spacing")}; std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0}; auto letter_spacing_val = prefs->getDouble("/tools/text/letterspacing", 0.0); - _letter_spacing_adj = Gtk::Adjustment::create(letter_spacing_val, -100000.0, 100000.0, 0.01, 0.10); + _letter_spacing_adj = Gtk::Adjustment::create(letter_spacing_val, -1000.0, 1000.0, 0.01, 0.10); _letter_spacing_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-letter-spacing", _("Letter:"), _letter_spacing_adj, 0.1, 2)); _letter_spacing_item->set_tooltip_text(_("Spacing between letters (px)")); _letter_spacing_item->set_custom_numeric_menu_data(values, labels); @@ -454,7 +454,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) std::vector labels = {_("Negative spacing"), "", "", "", C_("Text tool", "Normal"), "", "", "", "", "", "", "", _("Positive spacing")}; std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0}; auto word_spacing_val = prefs->getDouble("/tools/text/wordspacing", 0.0); - _word_spacing_adj = Gtk::Adjustment::create(word_spacing_val, -100000.0, 100000.0, 0.01, 0.10); + _word_spacing_adj = Gtk::Adjustment::create(word_spacing_val, -1000.0, 1000.0, 0.01, 0.10); _word_spacing_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-word-spacing", _("Word:"), _word_spacing_adj, 0.1, 2)); _word_spacing_item->set_tooltip_text(_("Spacing between words (px)")); _word_spacing_item->set_custom_numeric_menu_data(values, labels); @@ -471,7 +471,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) // Drop down menu std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5 }; auto dx_val = prefs->getDouble("/tools/text/dx", 0.0); - _dx_adj = Gtk::Adjustment::create(dx_val, -100000.0, 100000.0, 0.01, 0.1); + _dx_adj = Gtk::Adjustment::create(dx_val, -1000.0, 1000.0, 0.01, 0.1); _dx_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-dx", _("Kern:"), _dx_adj, 0.1, 2)); _dx_item->set_custom_numeric_menu_data(values); _dx_item->set_tooltip_text(_("Horizontal kerning (px)")); @@ -487,7 +487,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop) // Drop down menu std::vector values = { -2.0, -1.5, -1.0, -0.5, 0, 0.5, 1.0, 1.5, 2.0, 2.5 }; auto dy_val = prefs->getDouble("/tools/text/dy", 0.0); - _dy_adj = Gtk::Adjustment::create(dy_val, -100000.0, 100000.0, 0.01, 0.1); + _dy_adj = Gtk::Adjustment::create(dy_val, -1000.0, 1000.0, 0.01, 0.1); _dy_item = Gtk::manage(new UI::Widget::SpinButtonToolItem("text-dy", _("Vert:"), _dy_adj, 0.1, 2)); _dy_item->set_tooltip_text(_("Vertical kerning (px)")); _dy_item->set_custom_numeric_menu_data(values); -- GitLab