diff options
| author |  Nathan Schulte <nmschulte@gmail.com> | 2021-09-14 13:19:02 -0500 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2022-01-07 15:09:24 +0100 |
| commit | ec9e4630e08f7da00f3785ae1b1e0e52c2c8f993 (patch) | |
| tree | 4308bcf4a821c389dce02e583997f24c0f809825 | |
| parent | input/seat: unset has_focus when focus_stack becomes empty (diff) | |
| download | sway-ec9e4630e08f7da00f3785ae1b1e0e52c2c8f993.tar.gz sway-ec9e4630e08f7da00f3785ae1b1e0e52c2c8f993.tar.zst sway-ec9e4630e08f7da00f3785ae1b1e0e52c2c8f993.zip | |
swaybar: fix tray_padding vs min-height re: scale
Co-authored-by: xdavidwu <xdavidwuph@gmail.com>
(cherry picked from commit bb60381c7599677eb07b309fdbe418008201de44)
| -rw-r--r-- | swaybar/tray/tray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c index 5fe6f9c3..b0545f4a 100644 --- a/swaybar/tray/tray.c +++ b/swaybar/tray/tray.c | |||
| @@ -116,8 +116,8 @@ uint32_t render_tray(cairo_t *cairo, struct swaybar_output *output, double *x) { | |||
| 116 | } | 116 | } |
| 117 | } // else display on all | 117 | } // else display on all |
| 118 | 118 | ||
| 119 | if ((int) output->height*output->scale <= 2*config->tray_padding) { | 119 | if ((int)(output->height * output->scale) <= 2 * config->tray_padding) { |
| 120 | return 2*config->tray_padding + 1; | 120 | return (2 * config->tray_padding + 1) / output->scale; |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | uint32_t max_height = 0; | 123 | uint32_t max_height = 0; |