griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Remember asset shelf visibility per mode

Browse Source 
After feedback from the brush assets, we want to not only set the
default visibility, but also remember the visibility per mode. This way
we can keep the shelf hidden in modes where there's only one bundled
brush per available tool. While having these tools support brushes can
be useful, we don't expect to bundle more brushes soon. So to avoid a
mostly empy asset shelf for a single brush, allow keeping the shelf
hidden in these modes unless the user expands it. The following commit
will set the default visibility for these modes.

More strictly speaking this is entirely context sensitive, not just per
mode, but with current shelf types is practically per mode.
This commit is contained in:
Julian Eisel
2024-10-04 12:13:12 +02:00
parent 7596a08b2c
commit bf52f6f723
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/editors/asset/intern/asset_shelf.cc
View File

@@ -205,7 +205,8 @@ static void activate_shelf(RegionAssetShelf &shelf_regiondata, AssetShelf &shelf
static AssetShelf *update_active_shelf(const bContext &C,
const eSpace_Type space_type,
RegionAssetShelf &shelf_regiondata,
FunctionRef<void(AssetShelf &new_shelf)> on_create)
FunctionRef<void(AssetShelf &new_shelf)> on_create,
FunctionRef<void(AssetShelf &shelf)> on_reactivate)
{
/* NOTE: Don't access #AssetShelf.type directly, use #type_ensure(). */
@@ -229,6 +230,9 @@ static AssetShelf *update_active_shelf(const bContext &C,
if (type_poll_for_non_popup(C, ensure_shelf_has_type(*shelf), space_type)) {
/* Found a valid previously activated shelf, reactivate it. */
activate_shelf(shelf_regiondata, *shelf);
if (on_reactivate) {
on_reactivate(*shelf);
}
return shelf;
}
}
@@ -563,21 +567,38 @@ void region_on_poll_success(const bContext *C, ARegion *region)
return;
}
const int old_region_flag = region->flag;
ScrArea *area = CTX_wm_area(C);
update_active_shelf(
*C,
eSpace_Type(area->spacetype),
*shelf_regiondata,
/*on_create=*/[&](AssetShelf &new_shelf) {
/* Update region visibility (`'DEFAULT_VISIBLE'` option). */
const int old_flag = region->flag;
/*on_create=*/
[&](AssetShelf &new_shelf) {
/* Set region visibility for first time shelf is created (`'DEFAULT_VISIBLE'` option). */
SET_FLAG_FROM_TEST(region->flag,
(new_shelf.type->flag & ASSET_SHELF_TYPE_FLAG_DEFAULT_VISIBLE) == 0,
RGN_FLAG_HIDDEN);
if (old_flag != region->flag) {
ED_region_visibility_change_update(const_cast<bContext *>(C), area, region);
}
},
/*on_reactivate=*/
[&](AssetShelf &shelf) {
/* Restore region visibility from previous asset shelf instantiation when reactivating. */
SET_FLAG_FROM_TEST(
region->flag, shelf.instance_flag & ASSETSHELF_REGION_IS_HIDDEN, RGN_FLAG_HIDDEN);
});
if (old_region_flag != region->flag) {
ED_region_visibility_change_update(const_cast<bContext *>(C), area, region);
}
if (shelf_regiondata->active_shelf) {
/* Remember current visibility state of the region in the shelf, so we can restore it on
* reactivation. */
SET_FLAG_FROM_TEST(shelf_regiondata->active_shelf->instance_flag,
region->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER),
ASSETSHELF_REGION_IS_HIDDEN);
}
}
void header_region_listen(const wmRegionListenerParams *params)

14
source/blender/makesdna/DNA_screen_types.h
View File

@@ -835,7 +835,8 @@ typedef struct AssetShelf {
/** Only for the permanent asset shelf regions, not asset shelves in temporary popups. */
short preferred_row_count;
char _pad[6];
short instance_flag;
char _pad[4];
} AssetShelf;
/**
@@ -867,6 +868,17 @@ typedef enum AssetShelfSettings_DisplayFlag {
} AssetShelfSettings_DisplayFlag;
ENUM_OPERATORS(AssetShelfSettings_DisplayFlag, ASSETSHELF_SHOW_NAMES);
/* #AssetShelfSettings.instance_flag */
typedef enum AssetShelf_InstanceFlag {
/**
* Remember the last known region visibility state or this shelf, so it can be restored if the
* shelf is reactivated. Practically this makes the shelf visibility be remembered per mode.
* Continuously updated for the visible region.
*/
ASSETSHELF_REGION_IS_HIDDEN = (1 << 0),
} AssetShelf_InstanceFlag;
ENUM_OPERATORS(AssetShelf_InstanceFlag, ASSETSHELF_REGION_IS_HIDDEN);
typedef struct FileHandler {
DNA_DEFINE_CXX_METHODS(FileHandler)
/** Runtime. */