You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-12-30 18:30:54 +00:00
Merge pull request #114115 from YeldhamDev/dont_clip_that_please
Fix `TabContainer`'s minimum size ignoring the popup button
This commit is contained in:
@@ -64,7 +64,7 @@ void EditorBottomPanel::_on_tab_changed(int p_idx) {
|
||||
|
||||
void EditorBottomPanel::_theme_changed() {
|
||||
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()) {
|
||||
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 {
|
||||
Dictionary offsets;
|
||||
for (const KeyValue<String, int> &E : dock_offsets) {
|
||||
|
||||
@@ -67,8 +67,6 @@ protected:
|
||||
void _notification(int p_what);
|
||||
|
||||
public:
|
||||
virtual Size2 get_minimum_size() const override;
|
||||
|
||||
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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user