Skip to content

Commit 68190ce

Browse files
committed
Merge pull request godotengine#101478 from monxa/smaller-vc-min-size
Allow smaller minimum width of VersionControlEditorPlugin
2 parents b9fd015 + fe5612f commit 68190ce

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

editor/plugins/version_control_editor_plugin.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include "editor/gui/editor_bottom_panel.h"
4545
#include "editor/plugins/script_editor_plugin.h"
4646
#include "editor/themes/editor_scale.h"
47+
#include "scene/gui/flow_container.h"
4748
#include "scene/gui/separator.h"
4849

4950
#define CHECK_PLUGIN_INITIALIZED() \
@@ -1300,14 +1301,15 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
13001301

13011302
version_commit_dock->add_child(memnew(HSeparator));
13021303

1303-
HBoxContainer *menu_bar = memnew(HBoxContainer);
1304+
HFlowContainer *menu_bar = memnew(HFlowContainer);
13041305
menu_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
13051306
menu_bar->set_v_size_flags(Control::SIZE_FILL);
13061307
version_commit_dock->add_child(menu_bar);
13071308

13081309
branch_select = memnew(OptionButton);
13091310
branch_select->set_tooltip_text(TTR("Branches"));
13101311
branch_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
1312+
branch_select->set_clip_text(true);
13111313
branch_select->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_branch_item_selected));
13121314
branch_select->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_refresh_branch_list));
13131315
menu_bar->add_child(branch_select);
@@ -1353,6 +1355,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
13531355
remote_select = memnew(OptionButton);
13541356
remote_select->set_tooltip_text(TTR("Remotes"));
13551357
remote_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
1358+
remote_select->set_clip_text(true);
13561359
remote_select->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_remote_selected));
13571360
remote_select->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_refresh_remote_list));
13581361
menu_bar->add_child(remote_select);

0 commit comments

Comments
 (0)