aboutsummaryrefslogtreecommitdiffstats
path: root/swaynag
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-22 10:07:38 -0500
committerLibravatar M Stoeckl <code@mstoeckl.com>2019-01-22 10:12:04 -0500
commit0af5b26e41c5141d4094652133c230d76bf82e56 (patch)
tree75c61907f094838e23899231ec5ec955c530f692 /swaynag
parentMerge pull request #3494 from ianyfan/commands (diff)
downloadsway-0af5b26e41c5141d4094652133c230d76bf82e56.tar.gz
sway-0af5b26e41c5141d4094652133c230d76bf82e56.tar.zst
sway-0af5b26e41c5141d4094652133c230d76bf82e56.zip
Fix dead stores found by scan-build
In addition to removing unused code, two minor problems are fixed: (1) `resize set` and `resize adjust` did not error when given too many arguments. (2) `orientation` was incorrectly overridden to be 'U' for scroll events in the swaybar tray `handle_click` function.
Diffstat (limited to 'swaynag')
-rw-r--r--swaynag/render.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/swaynag/render.c b/swaynag/render.c
index c9f4ef1d..f6507e67 100644
--- a/swaynag/render.c
+++ b/swaynag/render.c
@@ -8,9 +8,6 @@
8#include "wlr-layer-shell-unstable-v1-client-protocol.h" 8#include "wlr-layer-shell-unstable-v1-client-protocol.h"
9 9
10static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) { 10static uint32_t render_message(cairo_t *cairo, struct swaynag *swaynag) {
11 uint32_t height = swaynag->height * swaynag->scale;
12 height -= swaynag->type->bar_border_thickness * swaynag->scale;
13
14 int text_width, text_height; 11 int text_width, text_height;
15 get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL, 12 get_text_size(cairo, swaynag->type->font, &text_width, &text_height, NULL,
16 swaynag->scale, true, "%s", swaynag->message); 13 swaynag->scale, true, "%s", swaynag->message);
@@ -77,8 +74,6 @@ static int get_detailed_scroll_button_width(cairo_t *cairo,
77static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag, 74static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
78 uint32_t y) { 75 uint32_t y) {
79 uint32_t width = swaynag->width * swaynag->scale; 76 uint32_t width = swaynag->width * swaynag->scale;
80 uint32_t height = swaynag->height * swaynag->scale;
81 height -= swaynag->type->bar_border_thickness * swaynag->scale;
82 77
83 int border = swaynag->type->details_border_thickness * swaynag->scale; 78 int border = swaynag->type->details_border_thickness * swaynag->scale;
84 int padding = swaynag->type->message_padding * swaynag->scale; 79 int padding = swaynag->type->message_padding * swaynag->scale;
@@ -174,8 +169,6 @@ static uint32_t render_detailed(cairo_t *cairo, struct swaynag *swaynag,
174 169
175static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag, 170static uint32_t render_button(cairo_t *cairo, struct swaynag *swaynag,
176 int button_index, int *x) { 171 int button_index, int *x) {
177 uint32_t height = swaynag->height * swaynag->scale;
178 height -= swaynag->type->bar_border_thickness * swaynag->scale;
179 struct swaynag_button *button = swaynag->buttons->items[button_index]; 172 struct swaynag_button *button = swaynag->buttons->items[button_index];
180 173
181 int text_width, text_height; 174 int text_width, text_height;