[Bf-blender-cvs] [4a24c6fe37a] master: UI: Center the Status Bar Progress Text

Vincent Blankfield noreply at git.blender.org
Tue Jul 6 21:18:55 CEST 2021


Commit: 4a24c6fe37a7b8ebae17614616bf5ad2c23670f2
Author: Vincent Blankfield
Date:   Tue Jul 6 12:17:42 2021 -0700
Branches: master
https://developer.blender.org/rB4a24c6fe37a7b8ebae17614616bf5ad2c23670f2

UI: Center the Status Bar Progress Text

This patch horizontally centers the text inside the progress bar
widget. It is currently left-aligned and offset to the middle, which
doesn't center properly.

see D11205 for details and examples.

Differential Revision: https://developer.blender.org/D11205

Reviewed by Julian Eisel

===================================================================

M	source/blender/editors/interface/interface.c
M	source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index d3b74c91e86..32b86119753 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -4106,7 +4106,6 @@ static uiBut *ui_def_but(uiBlock *block,
                 UI_BTYPE_BLOCK,
                 UI_BTYPE_BUT_MENU,
                 UI_BTYPE_SEARCH_MENU,
-                UI_BTYPE_PROGRESS_BAR,
                 UI_BTYPE_DATASETROW,
                 UI_BTYPE_POPOVER)) {
     but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index f4d9c95ae09..001ae30e46d 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3720,10 +3720,6 @@ static void widget_progressbar(
   /* "slider" bar color */
   copy_v3_v3_uchar(wcol->inner, wcol->item);
   widgetbase_draw(&wtb_bar, wcol);
-
-  /* raise text a bit */
-  rect->xmin += (BLI_rcti_size_x(&rect_prog) / 2);
-  rect->xmax += (BLI_rcti_size_x(&rect_prog) / 2);
 }
 
 static void widget_datasetrow(



More information about the Bf-blender-cvs mailing list