godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114115 from YeldhamDev/dont_clip_that_please

Browse Source 
Fix `TabContainer`'s minimum size ignoring the popup button
This commit is contained in:
Rémi Verschelde
2025-12-18 14:29:10 +01:00
parent 6370912e13 4383cd06f1
commit 42f49e488b
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/gui/editor_bottom_panel.cpp
View File

@@ -64,7 +64,7 @@ void EditorBottomPanel::_on_tab_changed(int p_idx) {
void EditorBottomPanel::_theme_changed() { void EditorBottomPanel::_theme_changed() {
int icon_width = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)); int icon_width = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
int margin = bottom_hbox->get_minimum_size().x; int margin = bottom_hbox->get_minimum_size().width;
if (get_popup()) { if (get_popup()) {
margin -= icon_width; margin -= icon_width;
} }
@@ -128,12 +128,6 @@ void EditorBottomPanel::_repaint() {
} }
} }
Size2 EditorBottomPanel::get_minimum_size() const {
Size2 min_size = TabContainer::get_minimum_size();
min_size.x += bottom_hbox->get_combined_minimum_size().x;
return min_size;
}
void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const { void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const {
Dictionary offsets; Dictionary offsets;
for (const KeyValue<String, int> &E : dock_offsets) { for (const KeyValue<String, int> &E : dock_offsets) {

2
editor/gui/editor_bottom_panel.h
View File

@@ -67,8 +67,6 @@ protected:
void _notification(int p_what); void _notification(int p_what);
public: public:
virtual Size2 get_minimum_size() const override;
void save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const; void save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const;
void load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section); void load_layout_from_config(Ref<ConfigFile> p_config_file, const String &p_section);

18
scene/gui/tab_container.cpp
View File

@@ -1031,15 +1031,13 @@ Size2 TabContainer::get_minimum_size() const {
ms.width += theme_cache.tabbar_style->get_margin(SIDE_LEFT) + theme_cache.tabbar_style->get_margin(SIDE_RIGHT); ms.width += theme_cache.tabbar_style->get_margin(SIDE_LEFT) + theme_cache.tabbar_style->get_margin(SIDE_RIGHT);
ms.height += theme_cache.tabbar_style->get_margin(SIDE_TOP) + theme_cache.tabbar_style->get_margin(SIDE_BOTTOM); ms.height += theme_cache.tabbar_style->get_margin(SIDE_TOP) + theme_cache.tabbar_style->get_margin(SIDE_BOTTOM);
if (!get_clip_tabs()) { if (get_popup()) {
if (get_popup()) { ms.width += theme_cache.menu_icon->get_width();
ms.width += theme_cache.menu_icon->get_width(); }
}
if (theme_cache.side_margin > 0 && get_tab_alignment() != TabBar::ALIGNMENT_CENTER && if (theme_cache.side_margin > 0 && get_tab_alignment() != TabBar::ALIGNMENT_CENTER &&
(get_tab_alignment() != TabBar::ALIGNMENT_RIGHT || !get_popup())) { (get_tab_alignment() != TabBar::ALIGNMENT_RIGHT || !get_popup())) {
ms.width += theme_cache.side_margin; ms.width += theme_cache.side_margin;
}
} }
} }
@@ -1078,9 +1076,7 @@ void TabContainer::set_popup(Node *p_popup) {
if (had_popup != bool(popup)) { if (had_popup != bool(popup)) {
queue_redraw(); queue_redraw();
_update_margins(); _update_margins();
if (!get_clip_tabs()) { update_minimum_size();
update_minimum_size();
}
} }
} }