diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-10-20 01:16:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-20 01:16:24 +0200 |
commit | bb6c9f52c789a7058dbff6a3abb80f8ff5d778ba (patch) | |
tree | 62fe7879ad10215d361c3dd5bd4f4bbee230e0c9 | |
parent | Merge pull request #2883 from ponkyh/missing-stdlib (diff) | |
parent | Change initial background mode before arg parse. (diff) | |
download | sway-bb6c9f52c789a7058dbff6a3abb80f8ff5d778ba.tar.gz sway-bb6c9f52c789a7058dbff6a3abb80f8ff5d778ba.tar.zst sway-bb6c9f52c789a7058dbff6a3abb80f8ff5d778ba.zip |
Merge pull request #2884 from c-edw/feature/2867_FixScalingParameter
Prevent overriding background mode after it's been set.
-rw-r--r-- | swaylock/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/swaylock/main.c b/swaylock/main.c index 86dfd577..f2bb5c3e 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -385,7 +385,6 @@ static void load_image(char *arg, struct swaylock_state *state) { | |||
385 | return; | 385 | return; |
386 | } | 386 | } |
387 | wl_list_insert(&state->images, &image->link); | 387 | wl_list_insert(&state->images, &image->link); |
388 | state->args.mode = BACKGROUND_MODE_FILL; | ||
389 | wlr_log(WLR_DEBUG, "Loaded image %s for output %s", | 388 | wlr_log(WLR_DEBUG, "Loaded image %s for output %s", |
390 | image->path, image->output_name ? image->output_name : "*"); | 389 | image->path, image->output_name ? image->output_name : "*"); |
391 | } | 390 | } |
@@ -851,7 +850,7 @@ int main(int argc, char **argv) { | |||
851 | 850 | ||
852 | enum line_mode line_mode = LM_LINE; | 851 | enum line_mode line_mode = LM_LINE; |
853 | state.args = (struct swaylock_args){ | 852 | state.args = (struct swaylock_args){ |
854 | .mode = BACKGROUND_MODE_SOLID_COLOR, | 853 | .mode = BACKGROUND_MODE_FILL, |
855 | .font = strdup("sans-serif"), | 854 | .font = strdup("sans-serif"), |
856 | .radius = 50, | 855 | .radius = 50, |
857 | .thickness = 10, | 856 | .thickness = 10, |