From 13847b78d4f3c5021eb7c82128b3e86b76d95736 Mon Sep 17 00:00:00 2001 From: Alex Zastrow Date: Wed, 7 Feb 2024 14:30:04 +0100 Subject: [PATCH] Rename messages offset to scroll --- phobos/blender/display.py | 19 ++++++++++--------- phobos/blender/phobosgui.py | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/phobos/blender/display.py b/phobos/blender/display.py index bfc9a242..edc68916 100644 --- a/phobos/blender/display.py +++ b/phobos/blender/display.py @@ -206,7 +206,7 @@ def draw_textbox( draw_text(text, position=origin, size=textsize, color=textcolor) -def draw_message(text, msgtype, slot, opacity=1.0, offset=0): +def draw_message(text, msgtype, slot, opacity=1.0, scroll=0): """ Args: @@ -214,7 +214,7 @@ def draw_message(text, msgtype, slot, opacity=1.0, offset=0): msgtype: slot: opacity: (Default value = 1.0) - offset: (Default value = 0) + scroll: (Default value = 0) Returns: @@ -222,15 +222,16 @@ def draw_message(text, msgtype, slot, opacity=1.0, offset=0): blf.size(0, 6, 150) margin = 4 start = 20 + if slot == 0 and scroll > 0: + start = start + get_text_width('+' + str(scroll), size=6) + margin blocksize = 10 left, top = start, slotlower[slot] + 4 width, height = blocksize, blocksize draw_2dpolygon(left, top, width, height, fillcolor=(*colors[msgtype], 0.2 * opacity)) draw_text(text, (start + margin + blocksize - 1, slotlower[slot] + 4 - 1), size=6, color=(0, 0, 0, opacity)) draw_text(text, (start + margin + blocksize, slotlower[slot] + 4), size=6, color=(1, 1, 1, opacity)) - if slot == 0 and offset > 0: - # draw_text(str(offset) + ' \u25bc', (start - 30, slotlower[0] + 4), size=6, color=(1, 1, 1, opacity)) - draw_text('+' + str(offset), (start - 30, slotlower[0] + 4), size=6, color=(1, 1, 1, 1)) + if slot == 0 and scroll > 0: + draw_text('+' + str(scroll), (10, slotlower[0] + 4), size=6, color=(1, 1, 1, 1)) def draw_progressbar(value): @@ -445,13 +446,13 @@ def draw_callback_2d(self, context): if wm.draw_messages: for m in range(wm.phobos_msg_count): opacity = 1.0 - if 1 >= m <= wm.phobos_msg_offset - 1 or m >= wm.phobos_msg_count - 2: + if 1 >= m <= wm.phobos_msg_scroll - 1 or m >= wm.phobos_msg_count - 2: opacity = 0.5 - if wm.phobos_msg_offset > 1 > m or m >= wm.phobos_msg_count - 1: + if wm.phobos_msg_scroll > 1 > m or m >= wm.phobos_msg_count - 1: opacity = 0.1 try: - msg = messages[m + wm.phobos_msg_offset] - draw_message(msg['text'], msg['type'], m, opacity, offset=wm.phobos_msg_offset) + msg = messages[m + wm.phobos_msg_scroll] + draw_message(msg['text'], msg['type'], m, opacity, scroll=wm.phobos_msg_scroll) except IndexError: pass diff --git a/phobos/blender/phobosgui.py b/phobos/blender/phobosgui.py index d5c571f9..bf086e8b 100644 --- a/phobos/blender/phobosgui.py +++ b/phobos/blender/phobosgui.py @@ -1662,7 +1662,7 @@ def draw(self, context): dc1.prop(wm, "draw_progress") dc2.prop(wm, "draw_messages") dc2.prop(wm, 'phobos_msg_count') - dc2.prop(wm, 'phobos_msg_offset') + dc2.prop(wm, 'phobos_msg_scroll') layout.separator() @@ -1812,12 +1812,12 @@ def register(): description="How many Phobos log messages to show on screen", ) - bpy.types.WindowManager.phobos_msg_offset = IntProperty( - name='offset', + bpy.types.WindowManager.phobos_msg_scroll = IntProperty( + name='scroll', default=0, min=0, max=50, - description="The Phobos log message index to start with", + description="Use this to scroll through the messages", ) bpy.types.WindowManager.draw_progress = BoolProperty(name='Progress', default=True)