Initialize default values of menus via class level defaults

This commit is contained in:
Jan
2021-12-29 13:50:45 +01:00
parent bf7e136c54
commit f30bbd65da
6 changed files with 92 additions and 82 deletions

View File

@ -17,23 +17,23 @@ namespace menu
public:
std::string m_name;
CommonRect m_rect;
int m_style;
int m_border;
double m_border_size;
int m_style = 0;
int m_border = 0;
double m_border_size = 0;
CommonColor m_back_color;
CommonColor m_fore_color;
CommonColor m_fore_color = CommonColor(1.0, 1.0, 1.0, 1.0);
CommonColor m_border_color;
CommonColor m_focus_color;
CommonColor m_outline_color;
std::string m_background;
int m_owner_draw;
int m_owner_draw_flags;
int m_owner_draw = 0;
int m_owner_draw_flags = 0;
std::string m_sound_loop;
double m_fade_clamp;
int m_fade_cycle;
double m_fade_amount;
double m_fade_in_amount;
double m_blur_radius;
double m_fade_clamp = 0;
int m_fade_cycle = 0;
double m_fade_amount = 0;
double m_fade_in_amount = 0;
double m_blur_radius = 0;
std::string m_allowed_binding;
std::unique_ptr<ISimpleExpression> m_visible_expression;
std::unique_ptr<ISimpleExpression> m_rect_x_exp;
@ -48,16 +48,16 @@ namespace menu
std::unique_ptr<CommonEventHandlerSet> m_on_esc;
std::map<int, std::unique_ptr<CommonEventHandlerSet>> m_key_handlers;
bool m_full_screen;
bool m_screen_space;
bool m_decoration;
bool m_out_of_bounds_click;
bool m_popup;
bool m_legacy_split_screen_scale;
bool m_hidden_during_scope;
bool m_hidden_during_flashbang;
bool m_hidden_during_ui;
bool m_text_only_focus;
bool m_full_screen = false;
bool m_screen_space = false;
bool m_decoration = false;
bool m_out_of_bounds_click = false;
bool m_popup = false;
bool m_legacy_split_screen_scale = false;
bool m_hidden_during_scope = false;
bool m_hidden_during_flashbang = false;
bool m_hidden_during_ui = false;
bool m_text_only_focus = false;
std::vector<std::unique_ptr<CommonItemDef>> m_items;
};