This fixes something that has been bugging me for a while. Basically now dunst is scaling itself when drawing every single shape and text (with cairo and pango). With this patch we render everything at a uniform scaling factor of 1 and scale everything afterwards using cairo_surface_set_device_scale.

This should have some advantages (apart from conciseness), like making scaling on wayland possible (like I discussed with @alebastr under #1316)

NOTE: Everything works on Xorg, however I can't test it on Wayland and my display is not Hi-Dpi, so I am not sure if the pango dpi scaling is being applied correctly. If someone can test it it would be great 👍🏻

Apr 16 '24 20:04 bynect

I think that all the get_icon_width and get_*scale*icon function aren't needed anymore

Apr 16 '24 20:04 bynect

I have no clue about why the test are failing 😢

Apr 16 '24 21:04 bynect

I am trying to debug the use of uninitialized variables but even with libAsan I can't find it

Apr 19 '24 10:04 bynect

Finally figured it out. Basically I forgot that the test didn't call draw_setup. Since I moved the initialization of the PangoContext in draw_setup it was undefined and thus buggy, but only in tests.

Apr 19 '24 23:04 bynect

Codecov Report

Attention: Patch coverage is 57.52212% with 48 lines in your changes are missing coverage. Please review.

Project coverage is 65.85%. Comparing base (4384521) to head (b0620ce). Report is 15 commits behind head on master.

:exclamation: Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##           master    #1337      +/-   ##
==========================================
- Coverage   65.92%   65.85%   -0.08%     
==========================================
  Files          50       50              
  Lines        8070     8217     +147     
  Branches      925      961      +36     
==========================================
+ Hits         5320     5411      +91     
- Misses       2750     2806      +56     

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

Apr 19 '24 23:04 codecov-commenter

Everything things to work. I think it is ready for merge.

Things we may want to consider

• remove the icon scaling code (since we don't use it anymore). Alternatively we can render icons separately over the cairo surface to not downscale->upscale them. But this can be done in another pr.
• integrate the new scaling method with wayland for per-monitor-dpi

Apr 19 '24 23:04 bynect

@alebastr Where do you think should we place scale code so that the wayland backend can correctly get the scale needed? (to solve #1316)

Note that the pr is still not quite ready

May 01 '24 23:05 bynect

If someone can test it it would be great 👍🏻

I can test it on Wayland if desired, just give me instructions on what to look for

Jul 03 '24 10:07 matejdro

If someone can test it it would be great 👍🏻

I can test it on Wayland if desired, just give me instructions on what to look for

it would be great if you could check if the input works correctly (mouse clicks for closing etc) and if you notice any graphical discrepancy let me know. The only difference I noticed is that text is a bit less sharp but maybe it's just me?

Jul 03 '24 15:07 bynect

Only issue I have noticed is that, with scaling enabled, dunst window has bigger horizontal offset from the edge of the screen and the window is smaller. All below screenshots extend to the top right corner of the monitor.

This branch

Scaled monitor:

Interestingly enough, after I take a screenshot and Satty opens fullscreen, dunst window will become taller (even before Satty makes second notification):

Non-scaled monitor (still suffering from #1316):

After I turn off scaling on the other monitor, text is clearer for the non-scaled monitor and position bug disappears:

Dunst release

Scaled monitor:

Non-scaled monitor:

After I turn off scaling on the other monitor, text is clearer:

Mouse clicks seem to work fine. I also don't see any discrepancies regarding text quality between this branch and latest dunst release (but you can judge yourself from screenshots). Both monitors are 2560x1440, with 2x scaling on one of the monitors (where specified).

Compositor:

Hyprland, built from branch  at commit 918d8340afd652b011b937d29d5eea0be08467f5  (flake.lock: update).
Date: Tue Jun 25 12:06:02 2024
Tag: v0.41.2, commits: 4886

Jul 06 '24 06:07 matejdro

@matejdro so is the resolution still wrong even with this branch?

Also I can look into the offset problem, probably something was not scaled appropriately

Jul 06 '24 16:07 bynect

Above screenshots are from Hyprland.

On Sway, text look as bad on this branch as with the release:

But interestingly enough, on Hyprland, issue appears to be different. As you can see on the screenshots from the previous post, text is still worse when scaling is enabled, but it's not as jagged as on Sway. Maybe Hyprland applies some sort of font smoothing by default, not sure. This is also the case with release version of dunst, so no changes here.

Jul 10 '24 14:07 matejdro

Thanks very much for the feedback. I will investigate this further and make some changes 👍

Jul 10 '24 14:07 bynect

@matejdro just to let you know. the problem with wayland scaling is that we check for the screen before drawing but on wayland the protocol does not allow that with follow mode. so further changes are needed to this pr for it to work on wayland. maybe it should be done in a seperate pr

Jul 25 '24 17:07 bynect