Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assetlib: Fix long plugin names breaking the UI #80555

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Assetlib: Fix long plugin names breaking the UI #80555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions editor/plugins/asset_library_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ void EditorAssetLibraryItem::configure(const String &p_title, int p_asset_id, co
price->set_text(p_cost);
}

// TODO: Refactor this method to use the TextServer.
void EditorAssetLibraryItem::clamp_width(int p_max_width) {
int text_pixel_width = title->get_button_font().ptr()->get_string_size(title->get_text()).x * EDSCALE;

String full_text = title->get_text();
title->set_tooltip_text(full_text);

if (text_pixel_width > p_max_width) {
// Truncate title text to within the current column width.
int max_length = p_max_width / (text_pixel_width / full_text.length());
String truncated_text = full_text.left(max_length - 3) + "...";
title->set_text(truncated_text);
}
}

void EditorAssetLibraryItem::set_image(int p_type, int p_index, const Ref<Texture2D> &p_image) {
ERR_FAIL_COND(p_type != EditorAssetLibrary::IMAGE_QUEUE_ICON);
ERR_FAIL_COND(p_index != 0);
Expand Down Expand Up @@ -1007,11 +1022,11 @@ HBoxContainer *EditorAssetLibrary::_make_pages(int p_page, int p_page_count, int
}

//do the mario
int from = p_page - 5;
int from = p_page - (5 / EDSCALE);
if (from < 0) {
from = 0;
}
int to = from + 10;
int to = from + (10 / EDSCALE);
if (to > p_page_count) {
to = p_page_count;
}
Expand Down Expand Up @@ -1278,6 +1293,7 @@ void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const
EditorAssetLibraryItem *item = memnew(EditorAssetLibraryItem);
asset_items->add_child(item);
item->configure(r["title"], r["asset_id"], category_map[r["category_id"]], r["category_id"], r["author"], r["author_id"], r["cost"]);
item->clamp_width(asset_items_column_width);
item->connect("asset_selected", callable_mp(this, &EditorAssetLibrary::_select_asset));
item->connect("author_selected", callable_mp(this, &EditorAssetLibrary::_select_author));
item->connect("category_selected", callable_mp(this, &EditorAssetLibrary::_select_category));
Expand Down Expand Up @@ -1412,6 +1428,8 @@ void EditorAssetLibrary::_update_asset_items_columns() {
if (new_columns != asset_items->get_columns()) {
asset_items->set_columns(new_columns);
}

asset_items_column_width = (get_size().x / new_columns) - (100 * EDSCALE);
}

void EditorAssetLibrary::disable_community_support() {
Expand Down
4 changes: 4 additions & 0 deletions editor/plugins/asset_library_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ class EditorAssetLibraryItem : public PanelContainer {
public:
void configure(const String &p_title, int p_asset_id, const String &p_category, int p_category_id, const String &p_author, int p_author_id, const String &p_cost);

void clamp_width(int p_max_width);

EditorAssetLibraryItem();
};

Expand Down Expand Up @@ -305,6 +307,8 @@ class EditorAssetLibrary : public PanelContainer {

void _install_external_asset(String p_zip_path, String p_title);

int asset_items_column_width = 0;

void _update_asset_items_columns();

friend class EditorAssetLibraryItemDescription;
Expand Down
4 changes: 4 additions & 0 deletions scene/gui/link_button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ LinkButton::UnderlineMode LinkButton::get_underline_mode() const {
return underline_mode;
}

Ref<Font> LinkButton::get_button_font() const {
return theme_cache.font;
}

void LinkButton::pressed() {
if (uri.is_empty()) {
return;
Expand Down
2 changes: 2 additions & 0 deletions scene/gui/link_button.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ class LinkButton : public BaseButton {
void set_underline_mode(UnderlineMode p_underline_mode);
UnderlineMode get_underline_mode() const;

Ref<Font> get_button_font() const;

LinkButton(const String &p_text = String());
};

Expand Down
Loading