Merge pull request #50420 from KoBeWi/counter_headers
Add header theme type variations to labels
This commit is contained in:
commit
b61b30e6ff
|
@ -631,6 +631,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
|
||||||
additional_options_container->hide();
|
additional_options_container->hide();
|
||||||
|
|
||||||
Label *opts_label = memnew(Label);
|
Label *opts_label = memnew(Label);
|
||||||
|
opts_label->set_theme_type_variation("HeaderSmall");
|
||||||
opts_label->set_text("Additional Options");
|
opts_label->set_text("Additional Options");
|
||||||
additional_options_container->add_child(opts_label);
|
additional_options_container->add_child(opts_label);
|
||||||
|
|
||||||
|
@ -639,6 +640,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
|
||||||
device_container->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
device_container->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
|
|
||||||
Label *device_label = memnew(Label);
|
Label *device_label = memnew(Label);
|
||||||
|
device_label->set_theme_type_variation("HeaderSmall");
|
||||||
device_label->set_text("Device:");
|
device_label->set_text("Device:");
|
||||||
device_container->add_child(device_label);
|
device_container->add_child(device_label);
|
||||||
|
|
||||||
|
@ -858,6 +860,7 @@ Variant ActionMapEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
|
||||||
|
|
||||||
String name = selected->get_text(0);
|
String name = selected->get_text(0);
|
||||||
Label *label = memnew(Label(name));
|
Label *label = memnew(Label(name));
|
||||||
|
label->set_theme_type_variation("HeaderSmall");
|
||||||
label->set_modulate(Color(1, 1, 1, 1.0f));
|
label->set_modulate(Color(1, 1, 1, 1.0f));
|
||||||
action_tree->set_drag_preview(label);
|
action_tree->set_drag_preview(label);
|
||||||
|
|
||||||
|
|
|
@ -1700,6 +1700,8 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
|
||||||
VBoxContainer *vmem_vb = memnew(VBoxContainer);
|
VBoxContainer *vmem_vb = memnew(VBoxContainer);
|
||||||
HBoxContainer *vmem_hb = memnew(HBoxContainer);
|
HBoxContainer *vmem_hb = memnew(HBoxContainer);
|
||||||
Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:") + " "));
|
Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:") + " "));
|
||||||
|
vmlb->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
vmlb->set_h_size_flags(SIZE_EXPAND_FILL);
|
vmlb->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||||
vmem_hb->add_child(vmlb);
|
vmem_hb->add_child(vmlb);
|
||||||
vmem_hb->add_child(memnew(Label(TTR("Total:") + " ")));
|
vmem_hb->add_child(memnew(Label(TTR("Total:") + " ")));
|
||||||
|
|
|
@ -236,6 +236,8 @@ DependencyEditor::DependencyEditor() {
|
||||||
|
|
||||||
HBoxContainer *hbc = memnew(HBoxContainer);
|
HBoxContainer *hbc = memnew(HBoxContainer);
|
||||||
Label *label = memnew(Label(TTR("Dependencies:")));
|
Label *label = memnew(Label(TTR("Dependencies:")));
|
||||||
|
label->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
hbc->add_child(label);
|
hbc->add_child(label);
|
||||||
hbc->add_spacer();
|
hbc->add_spacer();
|
||||||
fixdeps = memnew(Button(TTR("Fix Broken")));
|
fixdeps = memnew(Button(TTR("Fix Broken")));
|
||||||
|
|
|
@ -92,6 +92,7 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
|
||||||
const char *const *names_ptr = p_src[i];
|
const char *const *names_ptr = p_src[i];
|
||||||
if (*names_ptr) {
|
if (*names_ptr) {
|
||||||
Label *lbl = memnew(Label);
|
Label *lbl = memnew(Label);
|
||||||
|
lbl->set_theme_type_variation("HeaderSmall");
|
||||||
lbl->set_text(p_sections[i]);
|
lbl->set_text(p_sections[i]);
|
||||||
vbc->add_child(lbl);
|
vbc->add_child(lbl);
|
||||||
|
|
||||||
|
|
|
@ -1510,7 +1510,9 @@ EditorFileDialog::EditorFileDialog() {
|
||||||
dir_next->connect("pressed", callable_mp(this, &EditorFileDialog::_go_forward));
|
dir_next->connect("pressed", callable_mp(this, &EditorFileDialog::_go_forward));
|
||||||
dir_up->connect("pressed", callable_mp(this, &EditorFileDialog::_go_up));
|
dir_up->connect("pressed", callable_mp(this, &EditorFileDialog::_go_up));
|
||||||
|
|
||||||
pathhb->add_child(memnew(Label(TTR("Path:"))));
|
Label *l = memnew(Label(TTR("Path:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
pathhb->add_child(l);
|
||||||
|
|
||||||
drives_container = memnew(HBoxContainer);
|
drives_container = memnew(HBoxContainer);
|
||||||
pathhb->add_child(drives_container);
|
pathhb->add_child(drives_container);
|
||||||
|
@ -1591,7 +1593,11 @@ EditorFileDialog::EditorFileDialog() {
|
||||||
fav_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
fav_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
HBoxContainer *fav_hb = memnew(HBoxContainer);
|
HBoxContainer *fav_hb = memnew(HBoxContainer);
|
||||||
fav_vb->add_child(fav_hb);
|
fav_vb->add_child(fav_hb);
|
||||||
fav_hb->add_child(memnew(Label(TTR("Favorites:"))));
|
|
||||||
|
l = memnew(Label(TTR("Favorites:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
fav_hb->add_child(l);
|
||||||
|
|
||||||
fav_hb->add_spacer();
|
fav_hb->add_spacer();
|
||||||
fav_up = memnew(Button);
|
fav_up = memnew(Button);
|
||||||
fav_up->set_flat(true);
|
fav_up->set_flat(true);
|
||||||
|
@ -1626,7 +1632,10 @@ EditorFileDialog::EditorFileDialog() {
|
||||||
|
|
||||||
VBoxContainer *list_vb = memnew(VBoxContainer);
|
VBoxContainer *list_vb = memnew(VBoxContainer);
|
||||||
list_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
list_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
list_vb->add_child(memnew(Label(TTR("Directories & Files:"))));
|
|
||||||
|
l = memnew(Label(TTR("Directories & Files:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
list_vb->add_child(l);
|
||||||
preview_hb->add_child(list_vb);
|
preview_hb->add_child(list_vb);
|
||||||
|
|
||||||
// Item (files and folders) list with context menu.
|
// Item (files and folders) list with context menu.
|
||||||
|
@ -1653,7 +1662,11 @@ EditorFileDialog::EditorFileDialog() {
|
||||||
preview_vb->hide();
|
preview_vb->hide();
|
||||||
|
|
||||||
file_box = memnew(HBoxContainer);
|
file_box = memnew(HBoxContainer);
|
||||||
file_box->add_child(memnew(Label(TTR("File:"))));
|
|
||||||
|
l = memnew(Label(TTR("File:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
file_box->add_child(l);
|
||||||
|
|
||||||
file = memnew(LineEdit);
|
file = memnew(LineEdit);
|
||||||
file->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE);
|
file->set_structured_text_bidi_override(Control::STRUCTURED_TEXT_FILE);
|
||||||
file->set_stretch_ratio(4);
|
file->set_stretch_ratio(4);
|
||||||
|
|
|
@ -319,7 +319,19 @@ void editor_register_fonts(Ref<Theme> p_theme) {
|
||||||
p_theme->set_font_size("main_button_font_size", "EditorFonts", default_font_size + 1 * EDSCALE);
|
p_theme->set_font_size("main_button_font_size", "EditorFonts", default_font_size + 1 * EDSCALE);
|
||||||
p_theme->set_font("main_button_font", "EditorFonts", df_bold);
|
p_theme->set_font("main_button_font", "EditorFonts", df_bold);
|
||||||
|
|
||||||
p_theme->set_font("font", "Label", df_bold);
|
p_theme->set_font("font", "Label", df);
|
||||||
|
|
||||||
|
p_theme->set_type_variation("HeaderSmall", "Label");
|
||||||
|
p_theme->set_font("font", "HeaderSmall", df_bold);
|
||||||
|
p_theme->set_font_size("font_size", "HeaderSmall", default_font_size);
|
||||||
|
|
||||||
|
p_theme->set_type_variation("HeaderMedium", "Label");
|
||||||
|
p_theme->set_font("font", "HeaderMedium", df_bold);
|
||||||
|
p_theme->set_font_size("font_size", "HeaderMedium", default_font_size + 1 * EDSCALE);
|
||||||
|
|
||||||
|
p_theme->set_type_variation("HeaderLarge", "Label");
|
||||||
|
p_theme->set_font("font", "HeaderLarge", df_bold);
|
||||||
|
p_theme->set_font_size("font_size", "HeaderLarge", default_font_size + 3 * EDSCALE);
|
||||||
|
|
||||||
// Documentation fonts
|
// Documentation fonts
|
||||||
MAKE_SOURCE_FONT(df_code);
|
MAKE_SOURCE_FONT(df_code);
|
||||||
|
|
|
@ -192,7 +192,9 @@ EditorPluginSettings::EditorPluginSettings() {
|
||||||
add_child(plugin_config_dialog);
|
add_child(plugin_config_dialog);
|
||||||
|
|
||||||
HBoxContainer *title_hb = memnew(HBoxContainer);
|
HBoxContainer *title_hb = memnew(HBoxContainer);
|
||||||
title_hb->add_child(memnew(Label(TTR("Installed Plugins:"))));
|
Label *l = memnew(Label(TTR("Installed Plugins:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
title_hb->add_child(l);
|
||||||
title_hb->add_spacer();
|
title_hb->add_spacer();
|
||||||
create_plugin = memnew(Button(TTR("Create")));
|
create_plugin = memnew(Button(TTR("Create")));
|
||||||
create_plugin->connect("pressed", callable_mp(this, &EditorPluginSettings::_create_clicked));
|
create_plugin->connect("pressed", callable_mp(this, &EditorPluginSettings::_create_clicked));
|
||||||
|
|
|
@ -812,6 +812,7 @@ ExportTemplateManager::ExportTemplateManager() {
|
||||||
main_vb->add_child(current_hb);
|
main_vb->add_child(current_hb);
|
||||||
|
|
||||||
Label *current_label = memnew(Label);
|
Label *current_label = memnew(Label);
|
||||||
|
current_label->set_theme_type_variation("HeaderSmall");
|
||||||
current_label->set_text(TTR("Current Version:"));
|
current_label->set_text(TTR("Current Version:"));
|
||||||
current_hb->add_child(current_label);
|
current_hb->add_child(current_label);
|
||||||
|
|
||||||
|
@ -821,6 +822,8 @@ ExportTemplateManager::ExportTemplateManager() {
|
||||||
// Current version statuses.
|
// Current version statuses.
|
||||||
// Status: Current version is missing.
|
// Status: Current version is missing.
|
||||||
current_missing_label = memnew(Label);
|
current_missing_label = memnew(Label);
|
||||||
|
current_missing_label->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
current_missing_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
current_missing_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
current_missing_label->set_align(Label::ALIGN_RIGHT);
|
current_missing_label->set_align(Label::ALIGN_RIGHT);
|
||||||
current_missing_label->set_text(TTR("Export templates are missing. Download them or install from a file."));
|
current_missing_label->set_text(TTR("Export templates are missing. Download them or install from a file."));
|
||||||
|
@ -828,6 +831,7 @@ ExportTemplateManager::ExportTemplateManager() {
|
||||||
|
|
||||||
// Status: Current version is installed.
|
// Status: Current version is installed.
|
||||||
current_installed_label = memnew(Label);
|
current_installed_label = memnew(Label);
|
||||||
|
current_installed_label->set_theme_type_variation("HeaderSmall");
|
||||||
current_installed_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
current_installed_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
current_installed_label->set_align(Label::ALIGN_RIGHT);
|
current_installed_label->set_align(Label::ALIGN_RIGHT);
|
||||||
current_installed_label->set_text(TTR("Export templates are installed and ready to be used."));
|
current_installed_label->set_text(TTR("Export templates are installed and ready to be used."));
|
||||||
|
@ -947,6 +951,7 @@ ExportTemplateManager::ExportTemplateManager() {
|
||||||
HBoxContainer *installed_versions_hb = memnew(HBoxContainer);
|
HBoxContainer *installed_versions_hb = memnew(HBoxContainer);
|
||||||
main_vb->add_child(installed_versions_hb);
|
main_vb->add_child(installed_versions_hb);
|
||||||
Label *installed_label = memnew(Label);
|
Label *installed_label = memnew(Label);
|
||||||
|
installed_label->set_theme_type_variation("HeaderSmall");
|
||||||
installed_label->set_text(TTR("Other Installed Versions:"));
|
installed_label->set_text(TTR("Other Installed Versions:"));
|
||||||
installed_versions_hb->add_child(installed_label);
|
installed_versions_hb->add_child(installed_label);
|
||||||
|
|
||||||
|
|
|
@ -424,6 +424,8 @@ GroupDialog::GroupDialog() {
|
||||||
vbc_left->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
vbc_left->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
|
|
||||||
Label *group_title = memnew(Label);
|
Label *group_title = memnew(Label);
|
||||||
|
group_title->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
group_title->set_text(TTR("Groups"));
|
group_title->set_text(TTR("Groups"));
|
||||||
vbc_left->add_child(group_title);
|
vbc_left->add_child(group_title);
|
||||||
|
|
||||||
|
@ -458,6 +460,8 @@ GroupDialog::GroupDialog() {
|
||||||
vbc_add->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
vbc_add->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
|
|
||||||
Label *out_of_group_title = memnew(Label);
|
Label *out_of_group_title = memnew(Label);
|
||||||
|
out_of_group_title->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
out_of_group_title->set_text(TTR("Nodes Not in Group"));
|
out_of_group_title->set_text(TTR("Nodes Not in Group"));
|
||||||
vbc_add->add_child(out_of_group_title);
|
vbc_add->add_child(out_of_group_title);
|
||||||
|
|
||||||
|
@ -506,6 +510,8 @@ GroupDialog::GroupDialog() {
|
||||||
vbc_remove->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
vbc_remove->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
|
|
||||||
Label *in_group_title = memnew(Label);
|
Label *in_group_title = memnew(Label);
|
||||||
|
in_group_title->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
in_group_title->set_text(TTR("Nodes in Group"));
|
in_group_title->set_text(TTR("Nodes in Group"));
|
||||||
vbc_remove->add_child(in_group_title);
|
vbc_remove->add_child(in_group_title);
|
||||||
|
|
||||||
|
@ -528,6 +534,8 @@ GroupDialog::GroupDialog() {
|
||||||
remove_filter->connect("text_changed", callable_mp(this, &GroupDialog::_remove_filter_changed));
|
remove_filter->connect("text_changed", callable_mp(this, &GroupDialog::_remove_filter_changed));
|
||||||
|
|
||||||
group_empty = memnew(Label());
|
group_empty = memnew(Label());
|
||||||
|
group_empty->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
group_empty->set_text(TTR("Empty groups will be automatically removed."));
|
group_empty->set_text(TTR("Empty groups will be automatically removed."));
|
||||||
group_empty->set_valign(Label::VALIGN_CENTER);
|
group_empty->set_valign(Label::VALIGN_CENTER);
|
||||||
group_empty->set_align(Label::ALIGN_CENTER);
|
group_empty->set_align(Label::ALIGN_CENTER);
|
||||||
|
|
|
@ -656,7 +656,9 @@ LocalizationEditor::LocalizationEditor() {
|
||||||
translations->add_child(tvb);
|
translations->add_child(tvb);
|
||||||
|
|
||||||
HBoxContainer *thb = memnew(HBoxContainer);
|
HBoxContainer *thb = memnew(HBoxContainer);
|
||||||
thb->add_child(memnew(Label(TTR("Translations:"))));
|
Label *l = memnew(Label(TTR("Translations:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
thb->add_child(l);
|
||||||
thb->add_spacer();
|
thb->add_spacer();
|
||||||
tvb->add_child(thb);
|
tvb->add_child(thb);
|
||||||
|
|
||||||
|
@ -684,7 +686,9 @@ LocalizationEditor::LocalizationEditor() {
|
||||||
translations->add_child(tvb);
|
translations->add_child(tvb);
|
||||||
|
|
||||||
HBoxContainer *thb = memnew(HBoxContainer);
|
HBoxContainer *thb = memnew(HBoxContainer);
|
||||||
thb->add_child(memnew(Label(TTR("Resources:"))));
|
Label *l = memnew(Label(TTR("Resources:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
thb->add_child(l);
|
||||||
thb->add_spacer();
|
thb->add_spacer();
|
||||||
tvb->add_child(thb);
|
tvb->add_child(thb);
|
||||||
|
|
||||||
|
@ -708,7 +712,9 @@ LocalizationEditor::LocalizationEditor() {
|
||||||
add_child(translation_res_file_open_dialog);
|
add_child(translation_res_file_open_dialog);
|
||||||
|
|
||||||
thb = memnew(HBoxContainer);
|
thb = memnew(HBoxContainer);
|
||||||
thb->add_child(memnew(Label(TTR("Remaps by Locale:"))));
|
l = memnew(Label(TTR("Remaps by Locale:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
thb->add_child(l);
|
||||||
thb->add_spacer();
|
thb->add_spacer();
|
||||||
tvb->add_child(thb);
|
tvb->add_child(thb);
|
||||||
|
|
||||||
|
@ -758,7 +764,9 @@ LocalizationEditor::LocalizationEditor() {
|
||||||
translation_locale_filter_mode->connect("item_selected", callable_mp(this, &LocalizationEditor::_translation_filter_mode_changed));
|
translation_locale_filter_mode->connect("item_selected", callable_mp(this, &LocalizationEditor::_translation_filter_mode_changed));
|
||||||
tmc->add_margin_child(TTR("Filter mode:"), translation_locale_filter_mode);
|
tmc->add_margin_child(TTR("Filter mode:"), translation_locale_filter_mode);
|
||||||
|
|
||||||
tmc->add_child(memnew(Label(TTR("Locales:"))));
|
Label *l = memnew(Label(TTR("Locales:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
tmc->add_child(l);
|
||||||
translation_filter = memnew(Tree);
|
translation_filter = memnew(Tree);
|
||||||
translation_filter->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
translation_filter->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
translation_filter->set_columns(1);
|
translation_filter->set_columns(1);
|
||||||
|
@ -772,7 +780,9 @@ LocalizationEditor::LocalizationEditor() {
|
||||||
translations->add_child(tvb);
|
translations->add_child(tvb);
|
||||||
|
|
||||||
HBoxContainer *thb = memnew(HBoxContainer);
|
HBoxContainer *thb = memnew(HBoxContainer);
|
||||||
thb->add_child(memnew(Label(TTR("Files with translation strings:"))));
|
Label *l = memnew(Label(TTR("Files with translation strings:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
thb->add_child(l);
|
||||||
thb->add_spacer();
|
thb->add_spacer();
|
||||||
tvb->add_child(thb);
|
tvb->add_child(thb);
|
||||||
|
|
||||||
|
|
|
@ -7137,6 +7137,7 @@ Node3DEditor::Node3DEditor(EditorNode *p_editor) {
|
||||||
sun_vb->hide();
|
sun_vb->hide();
|
||||||
|
|
||||||
sun_title = memnew(Label);
|
sun_title = memnew(Label);
|
||||||
|
sun_title->set_theme_type_variation("HeaderSmall");
|
||||||
sun_vb->add_child(sun_title);
|
sun_vb->add_child(sun_title);
|
||||||
sun_title->set_text(TTR("Preview Sun"));
|
sun_title->set_text(TTR("Preview Sun"));
|
||||||
sun_title->set_align(Label::ALIGN_CENTER);
|
sun_title->set_align(Label::ALIGN_CENTER);
|
||||||
|
@ -7228,6 +7229,8 @@ Node3DEditor::Node3DEditor(EditorNode *p_editor) {
|
||||||
environ_vb->hide();
|
environ_vb->hide();
|
||||||
|
|
||||||
environ_title = memnew(Label);
|
environ_title = memnew(Label);
|
||||||
|
environ_title->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
environ_vb->add_child(environ_title);
|
environ_vb->add_child(environ_title);
|
||||||
environ_title->set_text(TTR("Preview Environment"));
|
environ_title->set_text(TTR("Preview Environment"));
|
||||||
environ_title->set_align(Label::ALIGN_CENTER);
|
environ_title->set_align(Label::ALIGN_CENTER);
|
||||||
|
|
|
@ -3221,6 +3221,7 @@ ThemeEditor::ThemeEditor() {
|
||||||
|
|
||||||
theme_name = memnew(Label);
|
theme_name = memnew(Label);
|
||||||
theme_name->set_text(TTR("Theme") + ": ");
|
theme_name->set_text(TTR("Theme") + ": ");
|
||||||
|
theme_name->set_theme_type_variation("HeaderSmall");
|
||||||
top_menu->add_child(theme_name);
|
top_menu->add_child(theme_name);
|
||||||
|
|
||||||
top_menu->add_spacer(false);
|
top_menu->add_spacer(false);
|
||||||
|
|
|
@ -1013,8 +1013,11 @@ ProjectExportDialog::ProjectExportDialog() {
|
||||||
preset_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
preset_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
||||||
hbox->add_child(preset_vb);
|
hbox->add_child(preset_vb);
|
||||||
|
|
||||||
|
Label *l = memnew(Label(TTR("Presets")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
|
||||||
HBoxContainer *preset_hb = memnew(HBoxContainer);
|
HBoxContainer *preset_hb = memnew(HBoxContainer);
|
||||||
preset_hb->add_child(memnew(Label(TTR("Presets"))));
|
preset_hb->add_child(l);
|
||||||
preset_hb->add_spacer();
|
preset_hb->add_spacer();
|
||||||
preset_vb->add_child(preset_hb);
|
preset_vb->add_child(preset_hb);
|
||||||
|
|
||||||
|
|
|
@ -1210,7 +1210,9 @@ void SceneTreeDock::_notification(int p_what) {
|
||||||
HBoxContainer *top_row = memnew(HBoxContainer);
|
HBoxContainer *top_row = memnew(HBoxContainer);
|
||||||
top_row->set_name("NodeShortcutsTopRow");
|
top_row->set_name("NodeShortcutsTopRow");
|
||||||
top_row->set_h_size_flags(SIZE_EXPAND_FILL);
|
top_row->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||||
top_row->add_child(memnew(Label(TTR("Create Root Node:"))));
|
Label *l = memnew(Label(TTR("Create Root Node:")));
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
|
top_row->add_child(l);
|
||||||
top_row->add_spacer();
|
top_row->add_spacer();
|
||||||
|
|
||||||
Button *node_shortcuts_toggle = memnew(Button);
|
Button *node_shortcuts_toggle = memnew(Button);
|
||||||
|
|
|
@ -1172,6 +1172,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope
|
||||||
|
|
||||||
if (p_label) {
|
if (p_label) {
|
||||||
Label *label = memnew(Label);
|
Label *label = memnew(Label);
|
||||||
|
label->set_theme_type_variation("HeaderSmall");
|
||||||
label->set_position(Point2(10, 0));
|
label->set_position(Point2(10, 0));
|
||||||
label->set_text(TTR("Scene Tree (Nodes):"));
|
label->set_text(TTR("Scene Tree (Nodes):"));
|
||||||
|
|
||||||
|
|
|
@ -349,6 +349,7 @@ void BoxContainer::_bind_methods() {
|
||||||
|
|
||||||
MarginContainer *VBoxContainer::add_margin_child(const String &p_label, Control *p_control, bool p_expand) {
|
MarginContainer *VBoxContainer::add_margin_child(const String &p_label, Control *p_control, bool p_expand) {
|
||||||
Label *l = memnew(Label);
|
Label *l = memnew(Label);
|
||||||
|
l->set_theme_type_variation("HeaderSmall");
|
||||||
l->set_text(p_label);
|
l->set_text(p_label);
|
||||||
add_child(l);
|
add_child(l);
|
||||||
MarginContainer *mc = memnew(MarginContainer);
|
MarginContainer *mc = memnew(MarginContainer);
|
||||||
|
|
|
@ -390,6 +390,15 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
|
||||||
theme->set_constant("shadow_outline_size", "Label", 1 * scale);
|
theme->set_constant("shadow_outline_size", "Label", 1 * scale);
|
||||||
theme->set_constant("line_spacing", "Label", 3 * scale);
|
theme->set_constant("line_spacing", "Label", 3 * scale);
|
||||||
|
|
||||||
|
theme->set_type_variation("HeaderSmall", "Label");
|
||||||
|
theme->set_font_size("font_size", "HeaderSmall", default_font_size + 4);
|
||||||
|
|
||||||
|
theme->set_type_variation("HeaderMedium", "Label");
|
||||||
|
theme->set_font_size("font_size", "HeaderMedium", default_font_size + 8);
|
||||||
|
|
||||||
|
theme->set_type_variation("HeaderLarge", "Label");
|
||||||
|
theme->set_font_size("font_size", "HeaderLarge", default_font_size + 12);
|
||||||
|
|
||||||
// LineEdit
|
// LineEdit
|
||||||
|
|
||||||
theme->set_stylebox("normal", "LineEdit", make_stylebox(line_edit_png, 5, 5, 5, 5));
|
theme->set_stylebox("normal", "LineEdit", make_stylebox(line_edit_png, 5, 5, 5, 5));
|
||||||
|
@ -984,7 +993,7 @@ void make_default_theme(bool p_hidpi, Ref<Font> p_font) {
|
||||||
Ref<StyleBox> default_style;
|
Ref<StyleBox> default_style;
|
||||||
Ref<Texture2D> default_icon;
|
Ref<Texture2D> default_icon;
|
||||||
Ref<Font> default_font;
|
Ref<Font> default_font;
|
||||||
int default_font_size = 16;
|
|
||||||
if (p_font.is_valid()) {
|
if (p_font.is_valid()) {
|
||||||
// Use the custom font defined in the Project Settings.
|
// Use the custom font defined in the Project Settings.
|
||||||
default_font = p_font;
|
default_font = p_font;
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
|
|
||||||
#include "scene/resources/theme.h"
|
#include "scene/resources/theme.h"
|
||||||
|
|
||||||
|
const int default_font_size = 16;
|
||||||
|
|
||||||
void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const Ref<Font> &large_font, Ref<Texture2D> &default_icon, Ref<StyleBox> &default_style, float p_scale);
|
void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const Ref<Font> &large_font, Ref<Texture2D> &default_icon, Ref<StyleBox> &default_style, float p_scale);
|
||||||
void make_default_theme(bool p_hidpi, Ref<Font> p_font);
|
void make_default_theme(bool p_hidpi, Ref<Font> p_font);
|
||||||
void clear_default_theme();
|
void clear_default_theme();
|
||||||
|
|
Loading…
Reference in New Issue