godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-04 17:04:49 +00:00
Code Releases Wiki Activity

Merge pull request #81557 from YuriSizov/editor-toolbars-divided

Browse Source 
Improve the looks of 2D/3D viewport contextual toolbars
This commit is contained in:
Rémi Verschelde
2023-09-14 23:40:33 +02:00
parent 84caaf9f2f f542dffb39
commit 5a74ce9a56
17 changed files with 152 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
editor/plugins/canvas_item_editor_plugin.h
View File

@@ -48,6 +48,7 @@ class PanelContainer;
class StyleBoxTexture;
class ViewPanner;
class VScrollBar;
class VSeparator;
class VSplitContainer;
class CanvasItemEditorSelectedItem : public Object {
@@ -192,10 +193,14 @@ private:
HScrollBar *h_scroll = nullptr;
VScrollBar *v_scroll = nullptr;
// Used for secondary menu items which are displayed depending on the currently selected node
// (such as MeshInstance's "Mesh" menu).
PanelContainer *context_menu_panel = nullptr;
HBoxContainer *context_menu_hbox = nullptr;
PanelContainer *context_toolbar_panel = nullptr;
HBoxContainer *context_toolbar_hbox = nullptr;
HashMap<Control *, VSeparator *> context_toolbar_separators;
void _update_context_toolbar();
Transform2D transform;
GridVisibility grid_visibility = GRID_VISIBILITY_SHOW_WHEN_SNAPPING;