[Bf-blender-cvs] [a209681beec] master: UI: Remove Colons From Number Fields

Harley Acheson noreply at git.blender.org
Fri Aug 30 14:54:52 CEST 2019


Commit: a209681beecdb66ee79cb8b663e357584ec16009
Author: Harley Acheson
Date:   Fri Aug 30 05:53:41 2019 -0700
Branches: master
https://developer.blender.org/rBa209681beecdb66ee79cb8b663e357584ec16009

UI: Remove Colons From Number Fields

Removes the colon separating label and number inside some number fields.

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

Reviewed by Brecht Van Lommel

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

M	release/scripts/startup/bl_ui/space_sequencer.py
M	source/blender/editors/interface/interface_widgets.c

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

diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 27c40d7599b..5a678854a3f 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1467,7 +1467,7 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel):
         split.alignment = 'RIGHT'
         split.label(text="End")
         split = split.split(factor=0.8 + max_factor, align=True)
-        split.label(text="{:>14}".format(smpte_from_frame(frame_final_end) + ":"))
+        split.label(text="{:>14}".format(smpte_from_frame(frame_final_end)))
         split.alignment = 'RIGHT'
         split.label(text=str(frame_final_end) + " ")
 
@@ -1511,7 +1511,7 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel):
         split.label(text="Playhead")
         split = split.split(factor=0.8 + max_factor, align=True)
         playhead = frame_current - frame_final_start
-        split.label(text="{:>14}".format(smpte_from_frame(playhead) + ":"))
+        split.label(text="{:>14}".format(smpte_from_frame(playhead)))
         split.alignment = 'RIGHT'
         split.label(text=str(playhead) + " ")
 
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index d16986ede8f..0fafa07a060 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2188,7 +2188,7 @@ static void widget_draw_text(const uiFontStyle *fstyle,
     drawstr_right = strrchr(drawstr + but->ofs, ':');
     if (drawstr_right) {
       drawstr_right++;
-      drawstr_left_len = (drawstr_right - drawstr);
+      drawstr_left_len = (drawstr_right - drawstr - 1);
 
       while (*drawstr_right == ' ') {
         drawstr_right++;



More information about the Bf-blender-cvs mailing list