Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
zkovari committed Sep 22, 2024
2 parents 383d541 + 32b2f94 commit 7aeb571
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/main/python/plotlyst/view/widget/character/editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
promote_role, demote_role, Role, protagonist_role, antagonist_role, major_role, secondary_role, tertiary_role, \
love_interest_role, supporter_role, adversary_role, contagonist_role, guide_role, confidant_role, sidekick_role, \
foil_role, henchmen_role, love_style_field, disc_field
from plotlyst.env import app_env
from plotlyst.view.common import push_btn, action, tool_btn, label, wrap, restyle, \
scroll_area, emoji_font
from plotlyst.view.icons import IconRegistry, set_avatar
Expand Down Expand Up @@ -425,6 +426,8 @@ def reset(self):
def _addItem(self, item: SelectionItem, index: int):
btn = tool_btn(IconRegistry.from_name(item.icon, 'grey', item.icon_color), transparent_=True, checkable=True)
btn.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
if app_env.is_mac():
incr_font(btn)
btn.setText(item.text)
btn.setIconSize(QSize(32, 32))
btn.installEventFilter(OpacityEventFilter(btn, leaveOpacity=0.5, ignoreCheckedButton=True))
Expand Down
4 changes: 3 additions & 1 deletion src/main/python/plotlyst/view/widget/world/editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
QLabel, QToolTip
from overrides import overrides
from qthandy import vspacer, clear_layout, transparent, vbox, margins, hbox, sp, retain_when_hidden, decr_icon, pointy, \
grid, flow, spacer, line, incr_icon, gc, translucent
grid, flow, spacer, line, incr_icon, gc, translucent, incr_font
from qthandy.filter import OpacityEventFilter, VisibilityToggleEventFilter, DisabledClickEventFilter, DragEventFilter, \
DropEventFilter
from qtmenu import MenuWidget
Expand Down Expand Up @@ -764,6 +764,8 @@ def __init__(self, topic: Topic):
self.setCheckable(True)
pointy(self)
incr_icon(self, 4)
if app_env.is_mac():
incr_font(self)
self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextUnderIcon)
self.setStyleSheet('''
QToolButton {
Expand Down

0 comments on commit 7aeb571

Please sign in to comment.