Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve status icon custom colour when switching theme (#2452)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-07-08 15:19:33 +02:00
parent 791da75ae9
commit 551a7609f8
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/status.py
+2 -1
View File
@@ -192,7 +192,8 @@ class NWStatus:
def refreshIcons(self) -> None:
"""Refresh all icons."""
for entry in self._store.values():
entry.color = SHARED.theme.parseColor(entry.theme)
if entry.theme != CUSTOM_COL:
entry.color = SHARED.theme.parseColor(entry.theme)
entry.icon = NWStatus.createIcon(self._height, entry.color, entry.shape)
return
tests/test_core/test_core_status.py
+37 -5
View File
@@ -324,23 +324,55 @@ def testCoreStatus_Entries(mockGUI, mockRnd):
@pytest.mark.core
def testCoreStatus_RefreshIcons(mockGUIwithTheme, mockRnd):
"""Test refreshing the icons of the NWStatus class."""
def testCoreStatus_RefreshIcons_Theme(mockGUIwithTheme, mockRnd):
"""Test refreshing the icons with theme colours."""
nStatus = NWStatus(NWStatus.STATUS)
nStatus.add(None, "New", "default", "SQUARE", 0)
nStatus.add(None, "Note", "red", "CIRCLE", 0)
nStatus.add(None, "Draft", "yellow", "SQUARE", 0)
nStatus.add(None, "Finished", "green", "SQUARE", 0)
beforeIcons = [nStatus[statusKeys[i]].icon for i in range(4)]
iconsA = [nStatus[statusKeys[i]].icon for i in range(4)]
themeA = [nStatus[statusKeys[i]].theme for i in range(4)]
# Refreshing the icons should generate new ones
nStatus.refreshIcons()
afterIcons = [nStatus[statusKeys[i]].icon for i in range(4)]
iconsB = [nStatus[statusKeys[i]].icon for i in range(4)]
themeB = [nStatus[statusKeys[i]].theme for i in range(4)]
for before, after in zip(beforeIcons, afterIcons, strict=False):
for before, after in zip(iconsA, iconsB, strict=False):
assert before is not after
assert themeA == themeB
@pytest.mark.core
def testCoreStatus_RefreshIcons_Custom(mockGUIwithTheme, mockRnd):
"""Test refreshing the icons with custom colours."""
nStatus = NWStatus(NWStatus.STATUS)
nStatus.add(None, "New", "#707070", "SQUARE", 0)
nStatus.add(None, "Note", "#ff0000", "CIRCLE", 0)
nStatus.add(None, "Draft", "#ffff00", "SQUARE", 0)
nStatus.add(None, "Finished", "#00ff00", "SQUARE", 0)
iconsA = [nStatus[statusKeys[i]].icon for i in range(4)]
themeA = [nStatus[statusKeys[i]].theme for i in range(4)]
colorA = [nStatus[statusKeys[i]].color.getRgb() for i in range(4)]
# Refreshing the icons should generate new ones
nStatus.refreshIcons()
iconsB = [nStatus[statusKeys[i]].icon for i in range(4)]
themeB = [nStatus[statusKeys[i]].theme for i in range(4)]
colorB = [nStatus[statusKeys[i]].color.getRgb() for i in range(4)]
for before, after in zip(iconsA, iconsB, strict=False):
assert before is not after
# But they should have the same colour value (#2452)
assert themeA == [CUSTOM_COL, CUSTOM_COL, CUSTOM_COL, CUSTOM_COL]
assert themeB == [CUSTOM_COL, CUSTOM_COL, CUSTOM_COL, CUSTOM_COL]
assert colorA == colorB
@pytest.mark.core
def testCoreStatus_Pack(mockGUIwithTheme, mockRnd):