berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

fix clipping bug with focus ring

This commit is contained in:
nakst 2021-11-03 20:30:41 +00:00
parent 30b8d26c3f
commit a88271904d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/theme.cpp
View File

@ -738,7 +738,14 @@ void ThemeDrawBox(EsPainter *painter, EsRectangle rect, EsBuffer *data, float sc
rect.b += box->offset.b * scale;
int width = THEME_RECT_WIDTH(rect), height = THEME_RECT_HEIGHT(rect);
if (width <= 0 || height <= 0) return;
#ifdef IN_DESIGNER
if (!THEME_RECT_VALID(UIRectangleIntersection(rect, painter->clip))) {
#else
if (!THEME_RECT_VALID(EsRectangleIntersection(rect, painter->clip))) {
#endif
return;
}
bool isBlurred = box->flags & THEME_LAYER_BOX_IS_BLURRED;
@ -2007,8 +2014,7 @@ void UIStyle::PaintLayers(EsPainter *painter, EsRectangle location, int childTyp
bounds.t = _bounds.t + (int) (scale * layer->offset.t) + THEME_RECT_HEIGHT(_bounds) * layer->position.t / 100;
bounds.b = _bounds.t + (int) (scale * layer->offset.b) + THEME_RECT_HEIGHT(_bounds) * layer->position.b / 100;
if (layer->mode == whichLayers && THEME_RECT_WIDTH(bounds) > 0 && THEME_RECT_HEIGHT(bounds) > 0
&& THEME_RECT_VALID(EsRectangleIntersection(bounds, painter->clip))) {
if (layer->mode == whichLayers) {
EsBuffer data2 = data;
if (layer->type == THEME_LAYER_BOX) {