blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

UI: Region polling support #105088

Merged
Julian Eisel merged 39 commits from JulianEisel/blender:temp-region-poll into main 2023-04-05 15:30:46 +02:00
Conversation 0 Commits 39 Files Changed 18 +41 -1
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3fde89c2a8 - Show all commits

40
source/blender/blenloader/intern/versioning_300.cc
View File

@ -4014,5 +4014,45 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain)
*/
{
/* Keep this block, even when empty. */
/* Some regions used to be added/removed dynamically. Ensure they are always there, there is a
* `ARegionType.poll()` now. */
LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
if (sl->spacetype != SPACE_FILE) {
continue;
}
ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
&sl->regionbase;
ARegion *new_region;
if ((new_region = do_versions_add_region_if_not_found(
regionbase,
RGN_TYPE_UI,
"versioning: UI region for space file",
RGN_TYPE_TOOLS))) {
new_region->alignment = RGN_ALIGN_TOP;
new_region->flag |= RGN_FLAG_DYNAMIC_SIZE;
}
if ((new_region = do_versions_add_region_if_not_found(
regionbase,
RGN_TYPE_EXECUTE,
"versioning: execute region for space file",
RGN_TYPE_UI))) {
new_region->alignment = RGN_ALIGN_BOTTOM;
new_region->flag = RGN_FLAG_DYNAMIC_SIZE;
}
if ((new_region = do_versions_add_region_if_not_found(
regionbase,
RGN_TYPE_TOOL_PROPS,
"versioning: tool props region for space file",
RGN_TYPE_EXECUTE))) {
new_region->alignment = RGN_ALIGN_RIGHT;
new_region->flag = RGN_FLAG_HIDDEN;
}
}
}
}
}
}

2
source/blender/editors/space_file/space_file.c
View File

@ -78,7 +78,7 @@ static SpaceLink *file_create(const ScrArea *UNUSED(area), const Scene *UNUSED(s
BLI_addtail(&sfile->regionbase, region);
region->regiontype = RGN_TYPE_UI;
region->alignment = RGN_ALIGN_TOP;
region->flag |= RGN_FLAG_DYNAMIC_SIZE;
region->flag = RGN_FLAG_DYNAMIC_SIZE;
/* execute region */
region = MEM_callocN(sizeof(ARegion), "execute region for file");