From f3edfbe46adc465babf9c64c3103992dc9c1bc95 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Fri, 11 Oct 2019 16:58:27 +0000 Subject: [PATCH 1/2] Fix justify on shape inside text --- src/ui/toolbar/text-toolbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index 0145a01c4f..62a2bff921 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -2007,7 +2007,7 @@ void TextToolbar::selection_changed(Inkscape::Selection *selection) // don't bot Glib::RefPtr store = _align_item->get_store(); Gtk::TreeModel::Row row = *(store->get_iter("3")); // Justify entry UI::Widget::ComboToolItemColumns columns; - row[columns.col_sensitive] = isFlow; + row[columns.col_sensitive] = isFlow || query.shape_inside.value; int activeButton = 0; if (query.text_align.computed == SP_CSS_TEXT_ALIGN_JUSTIFY) -- GitLab From 40565d2841e1405aaf8a07ea7f1f6423261d032e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Fri, 11 Oct 2019 18:30:31 +0000 Subject: [PATCH 2/2] Fix wrong value --- src/ui/toolbar/text-toolbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index 62a2bff921..9743ce5244 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -2007,7 +2007,7 @@ void TextToolbar::selection_changed(Inkscape::Selection *selection) // don't bot Glib::RefPtr store = _align_item->get_store(); Gtk::TreeModel::Row row = *(store->get_iter("3")); // Justify entry UI::Widget::ComboToolItemColumns columns; - row[columns.col_sensitive] = isFlow || query.shape_inside.value; + row[columns.col_sensitive] = isFlow || query.shape_inside.set; int activeButton = 0; if (query.text_align.computed == SP_CSS_TEXT_ALIGN_JUSTIFY) -- GitLab