Update theme/style sheet handling to enable napari-console to use napari `font_size` setting #33

dalthviz · 2024-03-15T18:02:23Z

References and relevant issues

Closes #32

Description

Depends on/related to napari/napari#6753

A preview:

Notes

While working on this, I noticed that with napari latest main a deprecation warning appears (related with using the as_dict kwarg from the get_theme function). Added a note about that here.
To preserve compatibility with napari 0.4.x (at least 0.4.19) the previous logic was left. The new style_sheet kwarg added to the _update_theme method defines if the previous logic needs to be used (napari 0.5.0 will use the new style_sheet kwarg, see Use font_size setting to control napari-console font-size napari#6753)

codecov · 2024-03-15T18:41:38Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.77%. Comparing base (e2a8d71) to head (0b219dd).

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #33      +/-   ##
==========================================
+ Coverage   96.69%   96.77%   +0.07%     
==========================================
  Files           4        4              
  Lines         121      124       +3     
==========================================
+ Hits          117      120       +3     
  Misses          4        4

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Czaki

This is not correct approach. You either need to disconnect _update_theme from self.viewer.events.theme event or update _update_theme to read font size from settings

jni · 2024-09-19T08:14:29Z

@Czaki does @dalthviz's latest commit address your concerns?

Czaki · 2024-09-19T08:42:50Z

I just installed this PR and I do not see any changes when update theme or font size.

I do not see connection to any proper signal in the code

dalthviz · 2024-09-19T15:50:58Z

Did you check this alongside napari/napari#6753 @Czaki ? I checked again and works for me on Windows 🤔 (although as mentioned I see a deprecation warning related with the as_dict kwarg):

Anyhow, maybe the work over napari/napari#6753 and here is not the correct approach and these PRs should be closed?

DragaDoncila · 2024-10-02T00:22:59Z

@Czaki do you want to have another look at this after Daniel's last comment? Should this PR be closed or is it the right approach?

Czaki

Looks ok.

Minor change to not require napari import if styleshhet is provided.

Czaki · 2024-11-06T08:40:22Z

napari_console/qt_console.py

        from napari.qt import get_stylesheet
+        from napari.utils.theme import get_theme, template

-        # qtconsole unfortunately won't inherit the parent stylesheet
-        # so it needs to be directly set
-        raw_stylesheet = get_stylesheet()
-        # template and apply the primary stylesheet
-        # (should probably be done by napari)
-        # After napari 0.4.11, themes are evented models rather than
-        # dicts.
+        # After napari 0.5.0 the `as_dict` kwarg has been deprecated
+        # and will be removed in a future version.
        theme = get_theme(self.viewer.theme, as_dict=True)
-        self.style_sheet = template(raw_stylesheet, **theme)
-
-        # After napari 0.4.6 the following syntax will be allowed
-        # self.style_sheet = get_stylesheet(self.viewer.theme)
+        # In the future, with napari 0.5.0+, the following syntax will be allowed
+        # theme = get_theme(self.viewer.theme).to_rgb_dict()

+        # qtconsole unfortunately won't inherit the parent stylesheet
+        # so it needs to be directly set when required.
+        if style_sheet:
+            # napari 0.5.x uses the `style_sheet` kwarg
+            self.style_sheet = style_sheet
+        else:
+            # napari 0.4.x doesn't use the `style_sheet` kwarg
+            raw_stylesheet = get_stylesheet()
+            # template and apply the primary stylesheet
+            # (should probably be done by napari)
+            # After napari 0.4.11, themes are evented models rather than
+            # dicts.
+            self.style_sheet = template(raw_stylesheet, **theme)
+
+            # After napari 0.4.6 the following syntax will be allowed
+            # self.style_sheet = get_stylesheet(self.viewer.theme)


The imports and get_theme call should move int else clause.

Thanks for rechecking this! Latests commits should change the imports placement. Also noticed that still there was a need to connect to the viewer theme events when no style sheet is being passed (napari <0.5.5/without the changes done over napari/napari#6753). Re-added that event connection logic in case no style sheet is detected over the constructor.

Let me know if there is something else that needs to be done here!

…nnect to theme event if no stylesheet is passed on initialization

…anching to handle theme retrieval

jni · 2024-11-07T05:45:34Z

Amazing! Thanks both!

# References and relevant issues See napari/napari-console#32 and napari/napari-console#33 # Description Enable `napari-console` to react to the changes over the font size setting from napari. This needs some changes over `napari-console` too. See napari/napari-console#33 A preview: ![console_font_size](https://github.com/napari/napari/assets/16781833/1e7a328e-d333-4fd6-8834-835fa441df26) --------- Co-authored-by: Grzegorz Bokota <[email protected]>

Update theme logic handling to use napari font_size setting

652fe10

dalthviz mentioned this pull request Mar 15, 2024

Use font_size setting to control napari-console font-size napari/napari#6753

Merged

dalthviz added 2 commits March 15, 2024 13:25

Move logic to set style_sheet to napari

c4b4876

Restore 'as_dict' usage

29ff73f

dalthviz added 4 commits March 18, 2024 11:33

Add style_sheet param handling

97566be

Testing

3bd30c1

Testing

072bdb2

Testing

47eea3c

dalthviz changed the title ~~Update theme logic handling to use napari font_size setting~~ Update theme/style sheet handling to enable napari-console to use napari font_size setting Mar 18, 2024

dalthviz closed this Mar 18, 2024

dalthviz reopened this Mar 18, 2024

dalthviz marked this pull request as ready for review March 18, 2024 18:23

dalthviz marked this pull request as draft March 20, 2024 15:22

dalthviz added 2 commits March 20, 2024 12:14

Preserve style sheet update compatibility with napari 0.4.19

7cb12be

Only add note about 'as_dict' kwarg for the moment

a9b4d87

dalthviz marked this pull request as ready for review March 20, 2024 18:08

Czaki requested changes Mar 21, 2024

View reviewed changes

dalthviz and others added 2 commits March 21, 2024 13:34

Remove connection from viewer theme event to console _update_theme

0b219dd

Merge branch 'main' into font_size_setting

37f903f

dalthviz added 2 commits October 30, 2024 11:36

Merge branch 'main' into font_size_setting

1dd0749

Testing

e01b56d

Czaki approved these changes Nov 6, 2024

View reviewed changes

dalthviz added 2 commits November 6, 2024 10:29

Prevent triggering deprecation warning from 'as_dict' kwarg usage. Co…

232ba65

…nnect to theme event if no stylesheet is passed on initialization

Improve code comments that reference napari versions for the logic br…

9f17d59

…anching to handle theme retrieval

Czaki approved these changes Nov 6, 2024

View reviewed changes

Czaki merged commit 463f828 into napari:main Nov 6, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update theme/style sheet handling to enable napari-console to use napari `font_size` setting #33

Update theme/style sheet handling to enable napari-console to use napari `font_size` setting #33

dalthviz commented Mar 15, 2024 •

edited

Loading

codecov bot commented Mar 15, 2024 •

edited

Loading

Czaki left a comment

jni commented Sep 19, 2024

Czaki commented Sep 19, 2024

dalthviz commented Sep 19, 2024

DragaDoncila commented Oct 2, 2024

Czaki left a comment

Czaki Nov 6, 2024

dalthviz Nov 6, 2024

jni commented Nov 7, 2024

Update theme/style sheet handling to enable napari-console to use napari font_size setting #33

Update theme/style sheet handling to enable napari-console to use napari font_size setting #33

Conversation

dalthviz commented Mar 15, 2024 • edited Loading

References and relevant issues

Description

Notes

codecov bot commented Mar 15, 2024 • edited Loading

Codecov Report

Czaki left a comment

Choose a reason for hiding this comment

jni commented Sep 19, 2024

Czaki commented Sep 19, 2024

dalthviz commented Sep 19, 2024

DragaDoncila commented Oct 2, 2024

Czaki left a comment

Choose a reason for hiding this comment

Czaki Nov 6, 2024

Choose a reason for hiding this comment

dalthviz Nov 6, 2024

Choose a reason for hiding this comment

jni commented Nov 7, 2024

Update theme/style sheet handling to enable napari-console to use napari `font_size` setting #33

Update theme/style sheet handling to enable napari-console to use napari `font_size` setting #33

dalthviz commented Mar 15, 2024 •

edited

Loading

codecov bot commented Mar 15, 2024 •

edited

Loading