mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 19:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into default-floating-border

Browse source
This commit is contained in:
Brian Ashworth 2018-07-16 22:12:29 -04:00 committed by GitHub
parent 75c699db62 db3a363734
commit 10fc7a5b49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/config.c
View file

@ -474,7 +474,6 @@ static bool load_include_config(const char *path, const char *parent_dir,
list_del(config->config_chain, index); list_del(config->config_chain, index);
return false; return false;
} }
free(real_path);
// restore current_config_path // restore current_config_path
config->current_config_path = parent_config; config->current_config_path = parent_config;

3
sway/tree/view.c
View file

@ -1086,6 +1086,9 @@ bool view_is_visible(struct sway_view *view) {
} }
void view_set_urgent(struct sway_view *view, bool enable) { void view_set_urgent(struct sway_view *view, bool enable) {
if (view_is_urgent(view) == enable) {
return;
}
if (enable) { if (enable) {
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
if (seat_get_focus(seat) == view->swayc) { if (seat_get_focus(seat) == view->swayc) {