From 1c777727402a942be720712bce99ff18e58ee30a Mon Sep 17 00:00:00 2001 From: Magne Bratseth Date: Fri, 11 Mar 2016 10:34:05 +0100 Subject: [PATCH 1/2] Sizing the font-size elements leave them disabled and not shown later on --- editor/svg-editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index edf1ceac..3d0da144 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -2172,7 +2172,7 @@ TODOS // var elems = $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open'); var sel_toscale = '#tools_top .toolset, #editor_panel > *, #history_panel > *,'+ ' #main_button, #tools_left > *, #path_node_panel > *, #multiselected_panel > *,'+ -' #g_panel > *, #tool_font_size > *, .tools_flyout'; +' #g_panel > *, .tools_flyout'; var elems = $(sel_toscale); var scale = 1; From fc269cf045d1c8dae468d2186210fd6c3893393c Mon Sep 17 00:00:00 2001 From: Magne Bratseth Date: Fri, 11 Mar 2016 11:04:11 +0100 Subject: [PATCH 2/2] Make sure font size is set to display when text is selected --- editor/svg-editor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 3d0da144..a6dae7f7 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -1688,6 +1688,7 @@ TODOS if (el_name == 'text') { $('#text_panel').css('display', 'inline'); + $('#tool_font_size').css('display', 'inline'); if (svgCanvas.getItalic()) { $('#tool_italic').addClass('push_button_pressed').removeClass('tool_button'); } else { @@ -2172,7 +2173,7 @@ TODOS // var elems = $('.tool_button, .push_button, .tool_button_current, .disabled, .icon_label, #url_notice, #tool_open'); var sel_toscale = '#tools_top .toolset, #editor_panel > *, #history_panel > *,'+ ' #main_button, #tools_left > *, #path_node_panel > *, #multiselected_panel > *,'+ -' #g_panel > *, .tools_flyout'; +' #g_panel > *, #tool_font_size > *, .tools_flyout'; var elems = $(sel_toscale); var scale = 1;