commit d1c09ac0a7adf02a93432d1a2aa89d7e69cc9252
parent c1f913ddaf315bcf9252e3958b455f5a81d65c4f
Author: kolunmi <113054217+kolunmi@users.noreply.github.com>
Date: Fri, 9 Jun 2023 17:14:42 -0700
Merge pull request #9 from NikitaIvanovV/fix-mouse-scale
Fix broken click in-line command when scale > 1
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dwlb.c b/dwlb.c
@@ -664,7 +664,7 @@ pointer_frame(void *data, struct wl_pointer *pointer)
znet_tapesoftware_dwl_wm_monitor_v1_set_layout(seat->bar->dwl_wm_monitor, 2);
}
} else {
- uint32_t status_x = seat->bar->width - TEXT_WIDTH(seat->bar->status.text, seat->bar->width - x, seat->bar->textpadding);
+ uint32_t status_x = seat->bar->width / buffer_scale - TEXT_WIDTH(seat->bar->status.text, seat->bar->width - x, seat->bar->textpadding) / buffer_scale;
if (seat->pointer_x < status_x) {
/* Clicked on title */
if (custom_title) {
@@ -687,8 +687,8 @@ pointer_frame(void *data, struct wl_pointer *pointer)
/* Clicked on status */
for (i = 0; i < seat->bar->status.buttons_l; i++) {
if (seat->pointer_button == seat->bar->status.buttons[i].btn
- && seat->pointer_x >= status_x + seat->bar->textpadding + seat->bar->status.buttons[i].x1
- && seat->pointer_x < status_x + seat->bar->textpadding + seat->bar->status.buttons[i].x2) {
+ && seat->pointer_x >= status_x + seat->bar->textpadding + seat->bar->status.buttons[i].x1 / buffer_scale
+ && seat->pointer_x < status_x + seat->bar->textpadding + seat->bar->status.buttons[i].x2 / buffer_scale) {
shell_command(seat->bar->status.buttons[i].command);
break;
}