Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix events propagation

Browse source
This commit is contained in:
Jakub Trllo 2025-06-11 12:03:17 +02:00
parent d0889e33f6
commit 75154db185
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ayon_core/style/style.css
View file

@ -904,6 +904,9 @@ FilterValueItemsView #ContentWidget {
SearchItemDisplayWidget {
border-radius: 5px;
}
SearchItemDisplayWidget:hover {
background: {color:bg-buttons};
}
SearchItemDisplayWidget #ValueWidget {
border-radius: 3px;
background: {color:bg-buttons};

13
client/ayon_core/tools/loader/ui/search_bar.py
View file

@ -10,7 +10,6 @@ from ayon_core.tools.utils import (
get_qt_icon,
SquareButton,
BaseClickableFrame,
ClickableFrame,
PixmapLabel,
)
@ -75,7 +74,7 @@ class CloseButton(SquareButton):
icon.paint(painter, rect)
class SearchItemDisplayWidget(QtWidgets.QFrame):
class SearchItemDisplayWidget(BaseClickableFrame):
"""Widget displaying a set filter in the bar."""
close_requested = QtCore.Signal(str)
edit_requested = QtCore.Signal(str)
@ -92,6 +91,7 @@ class SearchItemDisplayWidget(QtWidgets.QFrame):
title_widget = QtWidgets.QLabel(f"{filter_def.title}:", self)
value_wrapper = QtWidgets.QWidget(self)
value_wrapper.setAttribute(QtCore.Qt.WA_TranslucentBackground, True)
value_widget = QtWidgets.QLabel(value_wrapper)
value_widget.setObjectName("ValueWidget")
value_widget.setText("")
@ -139,7 +139,7 @@ class SearchItemDisplayWidget(QtWidgets.QFrame):
def _on_remove_clicked(self):
self.close_requested.emit(self._filter_def.name)
def _request_edit(self):
def _mouse_release_callback(self):
self.edit_requested.emit(self._filter_def.name)
@ -174,7 +174,7 @@ class FiltersPopup(QtWidgets.QWidget):
def __init__(self, parent):
super().__init__(parent)
self.setWindowFlags(QtCore.Qt.Popup | QtCore.Qt.FramelessWindowHint)
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.setAttribute(QtCore.Qt.WA_TranslucentBackground, True)
shadow_frame = QtWidgets.QFrame(self)
shadow_frame.setObjectName("ShadowFrame")
@ -577,7 +577,7 @@ class FilterValuePopup(QtWidgets.QWidget):
self.value_changed.emit(self._filter_name)
class FiltersBar(ClickableFrame):
class FiltersBar(BaseClickableFrame):
filters_changed = QtCore.Signal()
def __init__(self, parent):
@ -612,7 +612,6 @@ class FiltersBar(ClickableFrame):
main_layout.addWidget(filters_wrap, 1)
search_btn.clicked.connect(self._on_filters_request)
self.clicked.connect(self._on_clicked)
self._search_btn = search_btn
self._filters_wrap = filters_wrap
@ -670,7 +669,7 @@ class FiltersBar(ClickableFrame):
self._filters_widget.setGeometry(geo)
def _on_clicked(self):
def _mouse_release_callback(self):
self._show_filters_popup()
def _show_filters_popup(self):

20
client/ayon_core/tools/utils/widgets.py
View file

@ -426,7 +426,7 @@ class BaseClickableFrame(QtWidgets.QFrame):
Callback is defined by overriding `_mouse_release_callback`.
"""
def __init__(self, parent):
super(BaseClickableFrame, self).__init__(parent)
super().__init__(parent)
self._mouse_pressed = False
@ -434,17 +434,23 @@ class BaseClickableFrame(QtWidgets.QFrame):
pass
def mousePressEvent(self, event):
super().mousePressEvent(event)
if event.isAccepted():
return
if event.button() == QtCore.Qt.LeftButton:
self._mouse_pressed = True
super(BaseClickableFrame, self).mousePressEvent(event)
event.accept()
def mouseReleaseEvent(self, event):
if self._mouse_pressed:
self._mouse_pressed = False
if self.rect().contains(event.pos()):
self._mouse_release_callback()
pressed, self._mouse_pressed = self._mouse_pressed, False
super().mouseReleaseEvent(event)
if event.isAccepted():
return
super(BaseClickableFrame, self).mouseReleaseEvent(event)
accepted = pressed and self.rect().contains(event.pos())
if accepted:
event.accept()
self._mouse_release_callback()
class ClickableFrame(BaseClickableFrame):