ramtej/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

gui/experiments: fix custom color application to preserve default Qt styling

Browse Source
This commit is contained in:
Florian Agbuya 2025-01-31 22:17:46 +08:00 committed by Sébastien Bourdeauducq
parent d9cc35c724
commit d1177836f2
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
artiq/dashboard/experiments.py
View File

@ -79,18 +79,12 @@ class _ArgumentEditor(EntryTreeWidget):
argument["desc"] = procdesc argument["desc"] = procdesc
argument["state"] = state argument["state"] = state
self.update_argument(name, argument) self.update_argument(name, argument)
self.dock.apply_colors() self.dock.apply_window_color()
def apply_color(self, palette, color): def apply_color(self, color):
self.setPalette(palette) self.set_background_color(color)
for child in self.findChildren(QtWidgets.QWidget): self.set_gradient_color(color)
child.setPalette(palette) self.set_group_color(color)
child.setAutoFillBackground(True)
items = self.findItems("*",
QtCore.Qt.MatchFlag.MatchWildcard | QtCore.Qt.MatchFlag.MatchRecursive)
for item in items:
for column in range(item.columnCount()):
item.setBackground(column, QtGui.QColor(color))
# Hooks that allow user-supplied argument editors to react to imminent user # Hooks that allow user-supplied argument editors to react to imminent user
# actions. Here, we always keep the manager-stored submission arguments # actions. Here, we always keep the manager-stored submission arguments
@ -329,7 +323,7 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
self.argeditor = editor_class(self.manager, self, self.expurl) self.argeditor = editor_class(self.manager, self, self.expurl)
self.layout.addWidget(self.argeditor, 0, 0, 1, 5) self.layout.addWidget(self.argeditor, 0, 0, 1, 5)
self.argeditor.restore_state(argeditor_state) self.argeditor.restore_state(argeditor_state)
self.apply_colors() self.apply_window_color()
def contextMenuEvent(self, event): def contextMenuEvent(self, event):
menu = QtWidgets.QMenu(self) menu = QtWidgets.QMenu(self)
@ -353,22 +347,25 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
title=f"Select {key.replace('_', ' ').title()} color") title=f"Select {key.replace('_', ' ').title()} color")
if color.isValid(): if color.isValid():
self.manager.set_color(self.expurl, key, color.name()) self.manager.set_color(self.expurl, key, color.name())
self.apply_colors() if key == "title_bar":
self.apply_title_bar_color()
else:
self.apply_window_color()
def apply_colors(self): def apply_title_bar_color(self):
colors = self.manager.get_colors(self.expurl) colors = self.manager.get_colors(self.expurl)
if not colors: if not colors:
palette = QtWidgets.QApplication.palette() return
colors = { self.setStyle(_ColoredTitleBar(colors["title_bar"]))
"window": palette.color(QtGui.QPalette.ColorRole.Window).name(),
"title_bar": palette.color(QtGui.QPalette.ColorRole.Highlight).name(), def apply_window_color(self):
} colors = self.manager.get_colors(self.expurl)
self.manager.colors[self.expurl] = colors if not colors:
return
colors["window_text"] = "#000000" if QtGui.QColor( colors["window_text"] = "#000000" if QtGui.QColor(
colors["window"]).lightness() > 128 else "#FFFFFF" colors["window"]).lightness() > 128 else "#FFFFFF"
self.modify_palette(colors) self.modify_palette(colors)
self.setStyle(_ColoredTitleBar(colors["title_bar"])) self.argeditor.apply_color(colors["window"])
self.argeditor.apply_color(self.palette(), (colors["window"]))
def modify_palette(self, colors): def modify_palette(self, colors):
palette = self.palette() palette = self.palette()
@ -381,8 +378,13 @@ class _ExperimentDock(QtWidgets.QMdiSubWindow):
self.setPalette(palette) self.setPalette(palette)
def reset_colors(self): def reset_colors(self):
colors = self.manager.get_colors(self.expurl)
if not colors:
return
self.manager.reset_colors(self.expurl) self.manager.reset_colors(self.expurl)
self.apply_colors() self.setStyle(None)
self.setPalette(QtWidgets.QApplication.palette())
self.argeditor.apply_color(None)
async def _recompute_sched_options_task(self): async def _recompute_sched_options_task(self):
try: try:
@ -696,7 +698,12 @@ class ExperimentManager:
self.open_experiments[expurl] = dock self.open_experiments[expurl] = dock
dock.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose) dock.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose)
self.main_window.centralWidget().addSubWindow(dock) self.main_window.centralWidget().addSubWindow(dock)
dock.apply_colors() colors = self.get_colors(expurl)
if colors:
if "title_bar" in colors:
dock.apply_title_bar_color()
if "window" in colors:
dock.apply_window_color()
dock.show() dock.show()
dock.sigClosed.connect(partial(self.on_dock_closed, expurl)) dock.sigClosed.connect(partial(self.on_dock_closed, expurl))
if expurl in self.dock_states: if expurl in self.dock_states: