blender/blender
159
504
Fork 761
Code Issues 6.8k Pull Requests 912 Projects 18 Wiki Activity

UI: Tooltips for Assets #106189

Merged
Harley Acheson merged 1 commits from Harley/blender:TooltipsSimple into main 2023-04-12 18:44:59 +02:00
Conversation 4 Commits 1 Files Changed 1 +31 -1
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da31cc9b1b - Show all commits

30
source/blender/editors/space_file/file_draw.cc
View File

@ -11,6 +11,8 @@
#include "MEM_guardedalloc.h"
#include "AS_asset_representation.h"
#include "BLI_blenlib.h"
#include "BLI_fileops_types.h"
#include "BLI_utildefines.h"
@ -36,6 +38,7 @@
#include "RNA_access.h"
#include "RNA_prototypes.h"
#include "ED_asset_handle.h"
#include "ED_fileselect.h"
#include "ED_screen.h"
@ -111,6 +114,18 @@ static char *file_draw_tooltip_func(bContext * /*C*/, void *argN, const char * /
return BLI_strdup(dyn_tooltip);
}
static char *file_draw_asset_tooltip_func(bContext * /*C*/, void *argN, const char * /*tip*/)
{
const AssetRepresentation *asset = static_cast<AssetRepresentation *>(argN);
std::string complete_string = AS_asset_representation_name_get(asset);
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-04-11 18:58:19 +02:00
Outdated
Review
Copy Link

I would suggest using std::string instead of a fixed size buffer. Removes the length limit and makes the code a lot more readable. Check node_errors_tooltip_fn() as reference.
(Sorry for only bringing this up now)

I would suggest using `std::string` instead of a fixed size buffer. Removes the length limit and makes the code a lot more readable. Check `node_errors_tooltip_fn()` as reference. (Sorry for only bringing this up now)
Julian Eisel commented 2023-04-12 13:17:48 +02:00
Outdated
Review
Copy Link

Would initialize like this std::string complete_string = AS_asset_representation_name_get(asset);.

Would initialize like this `std::string complete_string = AS_asset_representation_name_get(asset);`.
const AssetMetaData &meta_data = *AS_asset_representation_metadata_get(asset);
if (meta_data.description) {
complete_string += '\n';
complete_string += meta_data.description;
}
return BLI_strdupn(complete_string.c_str(), complete_string.size());
}
static void draw_tile_background(const rcti *draw_rect, int colorid, int shade)
{
float color[4];
@ -164,6 +179,7 @@ static void file_but_enable_drag(uiBut *but,
static uiBut *file_add_icon_but(const SpaceFile *sfile,
uiBlock *block,
const char *path,
const FileDirEntry *file,
Harley marked this conversation as resolved Outdated
Julian Eisel commented 2023-04-11 12:03:51 +02:00
Outdated
Review
Copy Link

While using "minimal" .blend reading, BLO_version_from_file() still has to open a .blend file from disk, which can't just be assumed to be entirely trivial. E.g. on network drives, displaying this tooltip could freeze Blender for seconds, since everything happens on the main thread. We could query the version on file list loading (which uses a thread).

Opinion @mont29 / @ideasman42?

While using "minimal" .blend reading, `BLO_version_from_file()` still has to open a .blend file from disk, which can't just be assumed to be entirely trivial. E.g. on network drives, displaying this tooltip could freeze Blender for seconds, since everything happens on the main thread. We could query the version on file list loading (which uses a thread). Opinion @mont29 / @ideasman42?
const rcti *tile_draw_rect,
int icon,
int width,
@ -180,7 +196,13 @@ static uiBut *file_add_icon_but(const SpaceFile *sfile,
const float a2 = dimmed ? 0.3f : 0.0f;
but = uiDefIconBut(
block, UI_BTYPE_LABEL, 0, icon, x, y, width, height, nullptr, 0.0f, 0.0f, a1, a2, nullptr);
if (file->asset) {
UI_but_func_tooltip_set(but, file_draw_asset_tooltip_func, file->asset, nullptr);
}
else {
UI_but_func_tooltip_set(but, file_draw_tooltip_func, BLI_strdup(path), MEM_freeN);
}
return but;
}
@ -314,6 +336,13 @@ static void file_add_preview_drag_but(const SpaceFile *sfile,
0,
nullptr);
file_but_enable_drag(but, sfile, file, path, preview_image, icon, scale);
if (file->asset) {
UI_but_func_tooltip_set(but, file_draw_asset_tooltip_func, file->asset, nullptr);
}
else {
UI_but_func_tooltip_set(but, file_draw_tooltip_func, BLI_strdup(path), MEM_freeN);
}
}
static void file_draw_preview(const FileDirEntry *file,
@ -1057,6 +1086,7 @@ void file_draw_list(const bContext *C, ARegion *region)
uiBut *icon_but = file_add_icon_but(sfile,
block,
path,
file,
&tile_draw_rect,
icon,
ICON_DEFAULT_WIDTH_SCALE,