From dc0ac50f4543eb4ca3c2d9a044d1f510cba0bdc3 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 8 May 2021 18:56:48 +0200 Subject: Visually line up the selected tab with the underlying panel with borders --- editor/editor_themes.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 02380c4e39..fb92a9e898 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -641,6 +641,7 @@ Ref create_editor_theme(const Ref p_theme) { // Add a highlight line at the top of the selected tab. style_tab_selected->set_border_width_all(0); + style_tab_selected->set_default_margin(SIDE_LEFT, widget_default_margin.x - border_width); style_tab_selected->set_border_width(SIDE_TOP, Math::round(2 * EDSCALE)); // Make the highlight line prominent, but not too prominent as to not be distracting. Color tab_highlight = dark_color_2.lerp(accent_color, 0.75); @@ -653,6 +654,9 @@ Ref create_editor_theme(const Ref p_theme) { // We can't prevent them with both rounded corners and non-zero border width, though style_tab_selected->set_expand_margin_size(SIDE_BOTTOM, corner_width > 0 ? corner_width : border_width); + // When using a border width greater than 0, visually line up the left of the selected tab with the underlying panel. + style_tab_selected->set_expand_margin_size(SIDE_LEFT, -border_width); + style_tab_selected->set_default_margin(SIDE_LEFT, widget_default_margin.x + 2 * EDSCALE); style_tab_selected->set_default_margin(SIDE_RIGHT, widget_default_margin.x + 2 * EDSCALE); style_tab_selected->set_default_margin(SIDE_BOTTOM, widget_default_margin.y); -- cgit v1.2.3