Cleanup: remove toolbar popup release hack
This isn't needed since key-map items can ignore repeat events.
This commit is contained in:
parent
de9977260c
commit
2b0d08961a
|
@ -74,8 +74,6 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True):
|
|||
if tap_reset_tool not in items_all_id:
|
||||
use_tap_reset = False
|
||||
|
||||
from bl_operators.wm import use_toolbar_release_hack
|
||||
|
||||
# Pie-menu style release to activate.
|
||||
use_release_confirm = use_reset
|
||||
|
||||
|
@ -437,7 +435,7 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True):
|
|||
|
||||
kmi = keymap.keymap_items.new(
|
||||
"wm.tool_set_by_id",
|
||||
value='PRESS' if use_toolbar_release_hack else 'DOUBLE_CLICK',
|
||||
value='DOUBLE_CLICK',
|
||||
**kmi_toolbar_args_available,
|
||||
)
|
||||
kmi.properties.name = tap_reset_tool
|
||||
|
@ -451,15 +449,6 @@ def generate(context, space_type, use_fallback_keys=True, use_reset=True):
|
|||
)
|
||||
kmi.properties.skip_depressed = True
|
||||
|
||||
if use_toolbar_release_hack:
|
||||
# ... or pass through to let the toolbar know we're released.
|
||||
# Let the operator know we're released.
|
||||
kmi = keymap.keymap_items.new(
|
||||
"wm.tool_set_by_id",
|
||||
type=kmi_toolbar_type,
|
||||
value='RELEASE',
|
||||
any=True,
|
||||
)
|
||||
|
||||
wm.keyconfigs.update()
|
||||
return keymap
|
||||
|
|
|
@ -33,11 +33,6 @@ from bpy.props import (
|
|||
)
|
||||
from bpy.app.translations import pgettext_iface as iface_
|
||||
|
||||
# FIXME, we need a way to detect key repeat events.
|
||||
# unfortunately checking event previous values isn't reliable.
|
||||
use_toolbar_release_hack = True
|
||||
|
||||
|
||||
rna_path_prop = StringProperty(
|
||||
name="Context Attributes",
|
||||
description="RNA context string",
|
||||
|
@ -1692,18 +1687,6 @@ class WM_OT_tool_set_by_id(Operator):
|
|||
|
||||
space_type: rna_space_type_prop
|
||||
|
||||
if use_toolbar_release_hack:
|
||||
def invoke(self, context, event):
|
||||
# Hack :S
|
||||
if not self.properties.is_property_set("name"):
|
||||
WM_OT_toolbar._key_held = False
|
||||
return {'PASS_THROUGH'}
|
||||
elif (WM_OT_toolbar._key_held == event.type) and (event.value != 'RELEASE'):
|
||||
return {'PASS_THROUGH'}
|
||||
WM_OT_toolbar._key_held = None
|
||||
|
||||
return self.execute(context)
|
||||
|
||||
def execute(self, context):
|
||||
from bl_ui.space_toolsystem_common import (
|
||||
activate_by_id,
|
||||
|
@ -1794,13 +1777,6 @@ class WM_OT_toolbar(Operator):
|
|||
def poll(cls, context):
|
||||
return context.space_data is not None
|
||||
|
||||
if use_toolbar_release_hack:
|
||||
_key_held = None
|
||||
|
||||
def invoke(self, context, event):
|
||||
WM_OT_toolbar._key_held = event.type
|
||||
return self.execute(context)
|
||||
|
||||
@staticmethod
|
||||
def keymap_from_toolbar(context, space_type, use_fallback_keys=True, use_reset=True):
|
||||
from bl_ui.space_toolsystem_common import ToolSelectPanelHelper
|
||||
|
|
Loading…
Reference in New Issue