mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove redundant checks

Browse source
This commit is contained in:
Antonin Décimo 2019-08-10 17:03:20 +02:00 • committed by Drew DeVault
parent 64cfe746ab
commit d9c09c483a
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/border.c
View file

@ -75,7 +75,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
} else if (strcmp(argv[0], "pixel") == 0) { } else if (strcmp(argv[0], "pixel") == 0) {
set_border(container, B_PIXEL); set_border(container, B_PIXEL);
} else if (strcmp(argv[0], "csd") == 0) { } else if (strcmp(argv[0], "csd") == 0) {
if (!view || !view->xdg_decoration) { if (!view->xdg_decoration) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID,
"This window doesn't support client side decorations"); "This window doesn't support client side decorations");
} }

2
sway/commands/fullscreen.c
View file

@ -35,7 +35,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
bool is_fullscreen = false; bool is_fullscreen = false;
for (struct sway_container *curr = container; curr; curr = curr->parent) { for (struct sway_container *curr = container; curr; curr = curr->parent) {
if (curr && curr->fullscreen_mode != FULLSCREEN_NONE) { if (curr->fullscreen_mode != FULLSCREEN_NONE) {
container = curr; container = curr;
is_fullscreen = true; is_fullscreen = true;
break; break;

3
sway/input/seatop_default.c
View file

@ -334,8 +334,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
if (cont && is_floating_or_child && !is_fullscreen_or_child && if (cont && is_floating_or_child && !is_fullscreen_or_child &&
state == WLR_BUTTON_PRESSED) { state == WLR_BUTTON_PRESSED) {
uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT; uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
if (button == btn_move && state == WLR_BUTTON_PRESSED && if (button == btn_move && (mod_pressed || on_titlebar)) {
(mod_pressed || on_titlebar)) {
while (cont->parent) { while (cont->parent) {
cont = cont->parent; cont = cont->parent;
} }