mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2884 from c-edw/feature/2867_FixScalingParameter

Browse source 
Prevent overriding background mode after it's been set.
This commit is contained in:
Drew DeVault 2018-10-20 01:16:24 +02:00 committed by GitHub
commit bb6c9f52c7
Failed to generate hash of commit
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
swaylock/main.c
View file

@ -385,7 +385,6 @@ static void load_image(char *arg, struct swaylock_state *state) {
return;
}
wl_list_insert(&state->images, &image->link);
state->args.mode = BACKGROUND_MODE_FILL;
wlr_log(WLR_DEBUG, "Loaded image %s for output %s",
image->path, image->output_name ? image->output_name : "*");
}
@ -851,7 +850,7 @@ int main(int argc, char **argv) {
enum line_mode line_mode = LM_LINE;
state.args = (struct swaylock_args){
.mode = BACKGROUND_MODE_SOLID_COLOR,
.mode = BACKGROUND_MODE_FILL,
.font = strdup("sans-serif"),
.radius = 50,
.thickness = 10,