diff --git a/editor/asset_library/asset_library_editor_plugin.cpp b/editor/asset_library/asset_library_editor_plugin.cpp index 5ae75be4bd..4addbfb06c 100644 --- a/editor/asset_library/asset_library_editor_plugin.cpp +++ b/editor/asset_library/asset_library_editor_plugin.cpp @@ -224,6 +224,8 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) { author_license_hbox->add_child(license); license->connect(SceneStringName(pressed), callable_mp(this, &EditorAssetLibraryItem::_license_clicked)); + vb->add_spacer(); + HBoxContainer *rating_hbox = memnew(HBoxContainer); rating_hbox->set_mouse_filter(MOUSE_FILTER_IGNORE); vb->add_child(rating_hbox); @@ -235,11 +237,12 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) { rating_count = memnew(Label); rating_count->set_mouse_filter(MOUSE_FILTER_STOP); + rating_count->set_theme_type_variation("LabelNoMargin"); rating_count->set_tooltip_text(TTRC("Review Score")); - rating_count->set_accessibility_name(TTRC("Review score")); + rating_count->set_accessibility_name(TTRC("Review Score")); rating_hbox->add_child(rating_count); - set_accessibility_name(TTRC("Open asset details")); + set_accessibility_name(TTRC("Open Asset Details")); set_custom_minimum_size(Size2(250, 80) * EDSCALE); set_h_size_flags(SIZE_EXPAND_FILL); } @@ -944,7 +947,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { vb->add_child(title_hb); title = memnew(Label); title->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS); - title->set_theme_type_variation("LabelVMarginless"); + title->set_theme_type_variation("LabelNoMarginVertical"); title->set_focus_mode(FOCUS_ACCESSIBILITY); title->set_h_size_flags(Control::SIZE_EXPAND_FILL); title_hb->add_child(title); @@ -956,7 +959,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { version = memnew(Label); version->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); - version->set_theme_type_variation("LabelVMarginless"); + version->set_theme_type_variation("LabelNoMarginVertical"); vb->add_child(version); spacer = memnew(Control); diff --git a/editor/icons/ThumbsUp.svg b/editor/icons/ThumbsUp.svg index dceb82a545..5001227098 100644 --- a/editor/icons/ThumbsUp.svg +++ b/editor/icons/ThumbsUp.svg @@ -1 +1 @@ - + diff --git a/editor/themes/theme_classic.cpp b/editor/themes/theme_classic.cpp index f8b7632b7b..bbdb5ebb28 100644 --- a/editor/themes/theme_classic.cpp +++ b/editor/themes/theme_classic.cpp @@ -1237,11 +1237,16 @@ void ThemeClassic::populate_standard_styles(const Ref &p_theme, Edi p_theme->set_constant("line_spacing", "Label", 3 * EDSCALE); p_theme->set_constant("outline_size", "Label", 0); - // Label with no vertical margins. + // Label with different margins. - p_theme->set_type_variation("LabelVMarginless", "Label"); - Ref v_marginless_style = EditorThemeManager::make_empty_stylebox(p_config.base_empty_style->get_margin(SIDE_LEFT), 0, p_config.base_empty_style->get_margin(SIDE_RIGHT), 0); - p_theme->set_stylebox(CoreStringName(normal), "LabelVMarginless", v_marginless_style); + p_theme->set_type_variation("LabelNoMargin", "Label"); + p_theme->set_stylebox(CoreStringName(normal), "LabelNoMargin", EditorThemeManager::make_empty_stylebox()); + + p_theme->set_type_variation("LabelNoMarginVertical", "Label"); + Ref no_v_margin_style = p_config.base_empty_style->duplicate(); + no_v_margin_style->set_content_margin(SIDE_TOP, 0); + no_v_margin_style->set_content_margin(SIDE_BOTTOM, 0); + p_theme->set_stylebox(CoreStringName(normal), "LabelNoMarginVertical", no_v_margin_style); } // SpinBox. diff --git a/editor/themes/theme_modern.cpp b/editor/themes/theme_modern.cpp index cc030f7724..4e2569d5fb 100644 --- a/editor/themes/theme_modern.cpp +++ b/editor/themes/theme_modern.cpp @@ -1238,11 +1238,16 @@ void ThemeModern::populate_standard_styles(const Ref &p_theme, Edit p_theme->set_constant("line_spacing", "Label", 3 * EDSCALE); p_theme->set_constant("outline_size", "Label", 0); - // Label with no vertical margins. + // Label with different margins. - p_theme->set_type_variation("LabelVMarginless", "Label"); - Ref v_marginless_style = EditorThemeManager::make_empty_stylebox(label_style->get_margin(SIDE_LEFT), 0, label_style->get_margin(SIDE_RIGHT), 0); - p_theme->set_stylebox(CoreStringName(normal), "LabelVMarginless", v_marginless_style); + p_theme->set_type_variation("LabelNoMargin", "Label"); + p_theme->set_stylebox(CoreStringName(normal), "LabelNoMargin", p_config.base_empty_style); + + p_theme->set_type_variation("LabelNoMarginVertical", "Label"); + Ref no_v_margin_style = label_style->duplicate(); + no_v_margin_style->set_content_margin(SIDE_TOP, 0); + no_v_margin_style->set_content_margin(SIDE_BOTTOM, 0); + p_theme->set_stylebox(CoreStringName(normal), "LabelNoMarginVertical", no_v_margin_style); } // SpinBox.