diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-10 20:06:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-10 20:06:12 +0100 |
commit | e8f73124a7d97abc94cea3cf7fe5b5614f61a448 (patch) | |
tree | ff99e368359d56d760c8617af1021d0313635e38 /scene/gui/popup_menu.cpp | |
parent | 3c39aa8302a4f07a1470685bbf66f883c49f571e (diff) | |
parent | 7961a1dea3e7ce8c4e7197a0000e35ab31e9ff2e (diff) | |
download | redot-engine-e8f73124a7d97abc94cea3cf7fe5b5614f61a448.tar.gz |
Merge pull request #45845 from qarmin/cppcheck_scene_2
Initialize class variables with default values in scene/ [2/2]
Diffstat (limited to 'scene/gui/popup_menu.cpp')
-rw-r--r-- | scene/gui/popup_menu.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index b2ebb91500..835f4c432f 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -52,8 +52,8 @@ Size2 PopupMenu::_get_contents_minimum_size() const { Size2 minsize = get_theme_stylebox("panel")->get_minimum_size(); // Accounts for margin in the margin container minsize.x += scroll_container->get_v_scrollbar()->get_size().width * 2; // Adds a buffer so that the scrollbar does not render over the top of content - float max_w = 0; - float icon_w = 0; + float max_w = 0.0; + float icon_w = 0.0; int check_w = MAX(get_theme_icon("checked")->get_width(), get_theme_icon("radio_checked")->get_width()) + hseparation; int accel_max_w = 0; bool has_check = false; @@ -1656,19 +1656,6 @@ PopupMenu::PopupMenu() { connect("window_input", callable_mp(this, &PopupMenu::_gui_input)); - mouse_over = -1; - submenu_over = -1; - initial_button_mask = 0; - during_grabbed_click = false; - - allow_search = true; - search_time_msec = 0; - search_string = ""; - - set_hide_on_item_selection(true); - set_hide_on_checkable_item_selection(true); - set_hide_on_multistate_item_selection(false); - submenu_timer = memnew(Timer); submenu_timer->set_wait_time(0.3); submenu_timer->set_one_shot(true); |