blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix T57724: Opening file browser flips user-prefs header

This commit is contained in:
Campbell Barton 2018-12-14 08:43:14 +11:00
parent d6225c9caa
commit cb6d018ec9
Notes: blender-bot 2023-02-14 05:03:42 +01:00 
Referenced by issue #57724, Fix: Preferences header flips position after installing Addon
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/screen/area.c
View File

@ -1813,6 +1813,13 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
SpaceLink *sl;
/* store sa->type->exit callback */
void *sa_exit = sa->type ? sa->type->exit : NULL;
/* When the user switches between space-types from the type-selector,
* changing the header-type is jarring (especially when using Ctrl-MouseWheel).
*
* However, add-on install for example -forces the header to the top which shouldn't
* be applied back to the previous space type when closing - see: T57724
*/
const bool sync_header_alignment = (sa->flag & AREA_FLAG_TEMP_TYPE) == 0;
int header_alignment = ED_area_header_alignment(sa);
/* in some cases (opening temp space) we don't want to
@ -1865,10 +1872,12 @@ void ED_area_newspace(bContext *C, ScrArea *sa, int type, const bool skip_ar_exi
/* Sync header alignment. */
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->regiontype == RGN_TYPE_HEADER) {
ar->alignment = header_alignment;
break;
if (sync_header_alignment) {
for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
if (ar->regiontype == RGN_TYPE_HEADER) {
ar->alignment = header_alignment;
break;
}
}
}
}