blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix #113008: VIEW3D Header Overlap With No Transparency #113032

Merged
Harley Acheson merged 1 commits from Harley/blender:Fix113008 into blender-v4.0-release 2023-10-09 18:55:27 +02:00
Conversation 0 Commits 1 Files Changed 2 +14 -10
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/screen/area.cc
View File

@ -1300,15 +1300,19 @@ bool ED_region_is_overlap(int spacetype, int regiontype)
}
}
else if (spacetype == SPACE_VIEW3D) {
if (ELEM(regiontype,
RGN_TYPE_TOOLS,
RGN_TYPE_UI,
RGN_TYPE_TOOL_PROPS,
RGN_TYPE_FOOTER,
RGN_TYPE_HEADER,
RGN_TYPE_TOOL_HEADER,
RGN_TYPE_ASSET_SHELF,
RGN_TYPE_ASSET_SHELF_HEADER))
if (regiontype == RGN_TYPE_HEADER) {
/* Do not treat as overlapped if no transparency. */
bTheme *theme = UI_GetTheme();
return theme->space_view3d.header[3] != 255;
}
else if (ELEM(regiontype,
RGN_TYPE_TOOLS,
RGN_TYPE_UI,
RGN_TYPE_TOOL_PROPS,
RGN_TYPE_FOOTER,
RGN_TYPE_TOOL_HEADER,
RGN_TYPE_ASSET_SHELF,
RGN_TYPE_ASSET_SHELF_HEADER))
{
return true;
}

2
source/blender/makesrna/intern/rna_userdef.cc
View File

@ -1879,7 +1879,7 @@ static void rna_def_userdef_theme_space_common(StructRNA *srna)
prop = RNA_def_property(srna, "header", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 4);
RNA_def_property_ui_text(prop, "Header", "");
RNA_def_property_update(prop, 0, "rna_userdef_theme_update");
RNA_def_property_update(prop, 0, "rna_userdef_gpu_update");
prop = RNA_def_property(srna, "header_text", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_array(prop, 3);