Refactor draw code to use cairo_surface_set_device_scale
#1337
Conversation
|
I think that all the get_icon_width and get_*scale*icon function aren't needed anymore |
|
I have no clue about why the test are failing 😢 |
|
I am trying to debug the use of uninitialized variables but even with libAsan I can't find it |
| @@ -100,7 +103,8 @@ static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, | |||
| uint32_t button_state) { | |||
| struct dunst_seat *seat = data; | |||
|
|
|||
| input_handle_click(button, button_state, seat->pointer.x, seat->pointer.y); | |||
| double scale = wl_get_scale(); | |||
| input_handle_click(button, button_state, seat->pointer.x/scale, seat->pointer.y/scale); | |||
There was a problem hiding this comment.
before wayland didn't scale the user input
|
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. |
Codecov ReportAttention: Patch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ 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
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Everything things to work. I think it is ready for merge. Things we may want to consider
|
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. |
|
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 branchScaled 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 releaseScaled 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: |
|
@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 |
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 👍🏻