Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/editors/interface/interface_draw.c4
-rw-r--r--source/blender/editors/interface/interface_widgets.c3
4 files changed, 5 insertions, 2 deletions
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject fa8787a67ee6b34712896637edb0574973447a9
+Subproject 20f59bfd2bc12cc67d045c11f47b6925e3b2a0a
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject f72ec13e35dbd635c08ca331c8fac54086b0811
+Subproject 2e2931867a5ccb455e16e0ccf19d77530fb5e69
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 655c0b1775c..640d5127446 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1599,8 +1599,8 @@ void ui_draw_but_COLORBAND(uiBut *but, const uiWidgetColors *UNUSED(wcol), const
return;
}
- float x1 = rect->xmin + (0.25f * UI_UNIT_X);
- float sizex = rect->xmax - x1 - (0.30f * UI_UNIT_X);
+ float x1 = rect->xmin;
+ float sizex = rect->xmax - x1;
float sizey = BLI_rcti_size_y(rect);
float sizey_solid = sizey * 0.25f;
float y1 = rect->ymin;
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 5bcbc18fe27..594793371ae 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4645,6 +4645,9 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
break;
case UI_BTYPE_COLORBAND:
+ /* do not draw right to edge of rect */
+ rect->xmin += (0.25f * UI_UNIT_X);
+ rect->xmax -= (0.3f * UI_UNIT_X);
ui_draw_but_COLORBAND(but, &tui->wcol_regular, rect);
break;