[Bf-extensions-cvs] [f10ca8c1] master: BlenderKit: new assetbar wide HDRI previews
Vilem Duha
noreply at git.blender.org
Thu Oct 14 13:24:26 CEST 2021
Commit: f10ca8c156169b24e70027a43f718f99571d280f
Author: Vilem Duha
Date: Thu Oct 14 13:24:19 2021 +0200
Branches: master
https://developer.blender.org/rBAf10ca8c156169b24e70027a43f718f99571d280f
BlenderKit: new assetbar wide HDRI previews
also update validation icons on validation
===================================================================
M blenderkit/asset_bar_op.py
M blenderkit/bl_ui_widgets/bl_ui_label.py
M blenderkit/ui_panels.py
M blenderkit/upload.py
===================================================================
diff --git a/blenderkit/asset_bar_op.py b/blenderkit/asset_bar_op.py
index 890077cc..7b0935b6 100644
--- a/blenderkit/asset_bar_op.py
+++ b/blenderkit/asset_bar_op.py
@@ -170,6 +170,7 @@ def mouse_down_right(self, x, y):
BL_UI_Button.mouse_down_right = mouse_down_right
BL_UI_Button.set_mouse_down_right = set_mouse_down_right
+asset_bar_operator = None
# BL_UI_Button.handle_event = handle_event
@@ -245,9 +246,13 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
def init_tooltip(self):
self.tooltip_widgets = []
- tooltip_size = 500
- total_size = tooltip_size# + 2 * self.assetbar_margin
- self.tooltip_panel = BL_UI_Drag_Panel(0, 0, total_size, total_size)
+ tooltip_height = 500
+ tooltip_width = tooltip_height
+ ui_props = bpy.context.window_manager.blenderkitUI
+ if ui_props.asset_type == 'HDR':
+ tooltip_width = tooltip_width*2
+ # total_size = tooltip# + 2 * self.assetbar_margin
+ self.tooltip_panel = BL_UI_Drag_Panel(0, 0, tooltip_width, tooltip_height)
self.tooltip_panel.bg_color = (0.0, 0.0, 0.0, 0.5)
self.tooltip_panel.visible = False
self.author_text_size = 15
@@ -255,15 +260,15 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
tooltip_image.text = ""
img_path = paths.get_addon_thumbnail_path('thumbnail_notready.jpg')
tooltip_image.set_image(img_path)
- tooltip_image.set_image_size((tooltip_size, tooltip_size))
+ tooltip_image.set_image_size((tooltip_width, tooltip_height))
tooltip_image.set_image_position((0, 0))
self.tooltip_image = tooltip_image
self.tooltip_widgets.append(tooltip_image)
bottom_panel_fraction = 0.15
- labels_start = total_size * (1 - bottom_panel_fraction)
+ labels_start = tooltip_height * (1 - bottom_panel_fraction)
- dark_panel = BL_UI_Widget(0, labels_start, total_size, total_size * bottom_panel_fraction)
+ dark_panel = BL_UI_Widget(0, labels_start, tooltip_width, tooltip_height * bottom_panel_fraction)
dark_panel.bg_color = (0.0, 0.0, 0.0, 0.7)
self.tooltip_widgets.append(dark_panel)
@@ -271,13 +276,13 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
self.asset_name = name_label
self.tooltip_widgets.append(name_label)
- gravatar_size = int(tooltip_size * bottom_panel_fraction - self.assetbar_margin)
+ gravatar_size = int(tooltip_height * bottom_panel_fraction - self.assetbar_margin)
- authors_name = self.new_text('author',total_size - gravatar_size-self.assetbar_margin, total_size - self.author_text_size- self.assetbar_margin, labels_start, text_size=16, halign='RIGHT')
+ authors_name = self.new_text('author',tooltip_width - gravatar_size-self.assetbar_margin, tooltip_height - self.author_text_size- self.assetbar_margin, labels_start, text_size=16, halign='RIGHT')
self.authors_name = authors_name
self.tooltip_widgets.append(authors_name)
- gravatar_image = BL_UI_Button(total_size - gravatar_size, total_size - gravatar_size, 1, 1)
+ gravatar_image = BL_UI_Button(tooltip_width - gravatar_size, tooltip_height - gravatar_size, 1, 1)
gravatar_image.text = ""
img_path = paths.get_addon_thumbnail_path('thumbnail_notready.jpg')
gravatar_image.set_image(img_path)
@@ -364,7 +369,7 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
self.margin = ui_props.bl_rna.properties['margin'].default * ui_scale
self.margin = 7
- self.button_margin = 1
+ self.button_margin = 0
self.assetbar_margin = self.margin
self.thumb_size = user_preferences.thumb_size * ui_scale
@@ -585,6 +590,9 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
return False
ui_props.assetbar_on = True
+ global asset_bar_operator
+
+ asset_bar_operator = self
self.active_index = -1
@@ -598,6 +606,9 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
def on_finish(self, context):
# redraw all areas, since otherwise it stays to hang for some more time.
# bpy.types.SpaceView3D.draw_handler_remove(self._handle_2d_tooltip, 'WINDOW')
+ #to pass the operator to validation icons
+ global asset_bar_operator
+ asset_bar_operator = None
scene = bpy.context.scene
ui_props = bpy.context.window_manager.blenderkitUI
@@ -621,7 +632,6 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
self.show_tooltip()
print(self.active_index, search_index)
if self.active_index != search_index:
- print('what is happening?')
self.active_index = search_index
scene = bpy.context.scene
@@ -654,9 +664,9 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
for r in bpy.context.area.regions:
if r.type == 'UI':
properties_width = r.width
- tooltip_x = min(widget.x_screen + widget.width,
- bpy.context.region.width - self.tooltip_panel.width - properties_width)
- tooltip_y = widget.y_screen + widget.height
+ tooltip_x = min(int(widget.x_screen + widget.width),
+ int(bpy.context.region.width - self.tooltip_panel.width - properties_width))
+ tooltip_y = int(widget.y_screen + widget.height)
self.tooltip_panel.update(tooltip_x, tooltip_y)
self.tooltip_panel.layout_widgets()
print(tooltip_x, tooltip_y)
@@ -695,6 +705,15 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
blenderkit.search.search(get_next=True)
+ def update_validation_icon(self,asset_button, asset_data):
+ v_icon = ui.verification_icons[asset_data.get('verificationStatus', 'validated')]
+ if v_icon is not None:
+ img_fp = paths.get_addon_thumbnail_path(v_icon)
+ asset_button.validation_icon.set_image(img_fp)
+ asset_button.validation_icon.visible = True
+ else:
+ asset_button.validation_icon.visible = False
+
def update_images(self):
sr = bpy.context.window_manager.get('search results')
if not sr:
@@ -714,14 +733,9 @@ class BlenderKitAssetBarOperator(BL_UI_OT_draw_operator):
img_filepath = paths.get_addon_thumbnail_path('thumbnail_notready.jpg')
else:
img_filepath = img.filepath
+
asset_button.set_image(img_filepath)
- v_icon = ui.verification_icons[asset_data.get('verificationStatus', 'validated')]
- if v_icon is not None:
- img_fp = paths.get_addon_thumbnail_path(v_icon)
- asset_button.validation_icon.set_image(img_fp)
- asset_button.validation_icon.visible = True
- else:
- asset_button.validation_icon.visible = False
+ self.update_validation_icon(asset_button,asset_data)
else:
asset_button.visible = False
asset_button.validation_icon.visible = False
diff --git a/blenderkit/bl_ui_widgets/bl_ui_label.py b/blenderkit/bl_ui_widgets/bl_ui_label.py
index 3125a865..960d3b92 100644
--- a/blenderkit/bl_ui_widgets/bl_ui_label.py
+++ b/blenderkit/bl_ui_widgets/bl_ui_label.py
@@ -56,7 +56,6 @@ class BL_UI_Label(BL_UI_Widget):
r, g, b, a = self._text_color
x = self.x_screen
y = textpos_y
- print(self._halign)
if self._halign != 'LEFT':
width, height = blf.dimensions(font_id, self._text)
if self._halign == 'RIGHT':
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index bb5c393a..e4342017 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -2332,6 +2332,9 @@ def header_search_draw(self, context):
elif ui_props.asset_type == 'HDR':
layout.popover(panel="VIEW3D_PT_blenderkit_advanced_HDR_search", text="", icon_value=icon_id)
+ if utils.profile_is_validator():
+ search_props = utils.get_search_props()
+ layout.prop(search_props, 'search_verification_status', text ='')
def ui_message(title, message):
def draw_message(self, context):
diff --git a/blenderkit/upload.py b/blenderkit/upload.py
index 65a70780..7c67d55f 100644
--- a/blenderkit/upload.py
+++ b/blenderkit/upload.py
@@ -18,7 +18,7 @@
from blenderkit import asset_inspector, paths, utils, bg_blender, autothumb, version_checker, search, ui_panels, ui, \
- overrides, colors, rerequests, categories, upload_bg, tasks_queue, image_utils
+ overrides, colors, rerequests, categories, upload_bg, tasks_queue, image_utils, asset_bar_op
import tempfile, os, subprocess, json, re
@@ -1362,6 +1362,8 @@ class AssetVerificationStatusChange(Operator):
thread = threading.Thread(target=verification_status_change_thread,
args=(self.asset_id, self.state, preferences.api_key))
thread.start()
+ if asset_bar_op.asset_bar_operator is not None:
+ asset_bar_op.asset_bar_operator.update_layout(context, None)
return {'FINISHED'}
def invoke(self, context, event):
More information about the Bf-extensions-cvs
mailing list