diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-22 09:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 09:05:23 +0200 |
| commit | 36a0fe6857c7b43c8b46df8940e108542a696282 (patch) | |
| tree | 0086183cc6ad61b2a086617564eb8abe2725d23d | |
| parent | eb00dad00c2cea7794543436bf756a18f648b272 (diff) | |
| parent | 08377b3f04891f1bd244ada7a9095979035e5a69 (diff) | |
Merge pull request #38936 from dreamsComeTrue/tab-container-icon-separation
Clarifies 'icon_separation' in TabContainer (instead of 'hseparation')
| -rw-r--r-- | doc/classes/TabContainer.xml | 4 | ||||
| -rw-r--r-- | scene/gui/tab_container.cpp | 4 | ||||
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/classes/TabContainer.xml b/doc/classes/TabContainer.xml index 22e92ae5d9..d56781105b 100644 --- a/doc/classes/TabContainer.xml +++ b/doc/classes/TabContainer.xml @@ -204,8 +204,8 @@ <theme_item name="font_color_fg" type="Color" default="Color( 0.94, 0.94, 0.94, 1 )"> Font color of the currently selected tab. </theme_item> - <theme_item name="hseparation" type="int" default="4"> - Horizontal separation between tabs. + <theme_item name="icon_separation" type="int" default="4"> + Space between tab's name and its icon. </theme_item> <theme_item name="increment" type="Texture2D"> Icon for the right arrow button that appears when there are too many tabs to fit in the container width. When the button is disabled (i.e. the last tab is visible) it appears semi-transparent. diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 97b8362214..8c4d9a5ece 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -278,7 +278,7 @@ void TabContainer::_notification(int p_what) { Color font_color_bg = get_theme_color("font_color_bg"); Color font_color_disabled = get_theme_color("font_color_disabled"); int side_margin = get_theme_constant("side_margin"); - int icon_text_distance = get_theme_constant("hseparation"); + int icon_text_distance = get_theme_constant("icon_separation"); // Find out start and width of the header area. int header_x = side_margin; @@ -465,7 +465,7 @@ int TabContainer::_get_tab_width(int p_index) const { if (icon.is_valid()) { width += icon->get_width(); if (text != "") { - width += get_theme_constant("hseparation"); + width += get_theme_constant("icon_separation"); } } } diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index f5b987e8df..de39fac627 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -681,7 +681,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const theme->set_color("font_color_disabled", "TabContainer", control_font_color_disabled); theme->set_constant("side_margin", "TabContainer", 8 * scale); - theme->set_constant("hseparation", "TabContainer", 4 * scale); + theme->set_constant("icon_separation", "TabContainer", 4 * scale); // Tabs |