mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: fix i3bar relative coordinates when scaling is used

Browse source 
24e8ba048a did not take scaling into account.
The hotspot size used pixel coordinates, the absolute coordinates were logical,
and the relative coordinates were completely wrong.

This commit makes all coordinates use logical values. If
`"float_event_coords":true` is sent in the handshake message, coordinates are
sent as floating-point values.

The "scale" field is an integer containing the scale value.
This commit is contained in:
Hristo Venev 2020-02-01 18:08:00 +01:00 • committed by Simon Ser
parent fca32b6334
commit 7affe5c1bd
8 changed files with 51 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
swaybar/render.c
View file

@ -131,11 +131,15 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color,
static enum hotspot_event_handling block_hotspot_callback(
struct swaybar_output *output, struct swaybar_hotspot *hotspot,
int x, int y, uint32_t button, void *data) {
double x, double y, uint32_t button, void *data) {
struct i3bar_block *block = data;
struct status_line *status = output->bar->status;
return i3bar_block_send_click(status, block, x, y, x - hotspot->x,
y - hotspot->y, hotspot->width, hotspot->height, button);
return i3bar_block_send_click(status, block, x, y,
x - (double)hotspot->x / output->scale,
y - (double)hotspot->y / output->scale,
(double)hotspot->width / output->scale,
(double)hotspot->height / output->scale,
output->scale, button);
}
static void i3bar_block_unref_callback(void *data) {
@ -540,7 +544,7 @@ static uint32_t render_binding_mode_indicator(cairo_t *cairo,
static enum hotspot_event_handling workspace_hotspot_callback(
struct swaybar_output *output, struct swaybar_hotspot *hotspot,
int x, int y, uint32_t button, void *data) {
double x, double y, uint32_t button, void *data) {
if (button != BTN_LEFT) {
return HOTSPOT_PROCESS;
}