diff options
| -rw-r--r-- | doc/tofi.5.md | 9 | ||||
| -rw-r--r-- | doc/tofi.5.scd | 9 | ||||
| -rw-r--r-- | src/config.c | 9 | ||||
| -rw-r--r-- | src/main.c | 1 | ||||
| -rw-r--r-- | themes/dmenu | 6 | ||||
| -rw-r--r-- | themes/dos | 10 | ||||
| -rw-r--r-- | themes/fullscreen | 2 |
7 files changed, 19 insertions, 27 deletions
diff --git a/doc/tofi.5.md b/doc/tofi.5.md index ee711ca..8455667 100644 --- a/doc/tofi.5.md +++ b/doc/tofi.5.md @@ -227,12 +227,11 @@ options. > Scale the window by the output's scale factor. > -> **WARNING**: In the next version of tofi, this will default to true, -> so set this to false now if you don't want that behaviour. Note that -> currently, font scaling will still occur when this is set to *false* - -> that will change when *true* becomes the default. +> **WARNING**: In the current version of tofi, the default value has +> changed to true, so you may need to update your config. Additionally, +> font scaling will no longer occur when this is set to *false*. > -> Default: false +> Default: true **margin-top**=*px\|%* diff --git a/doc/tofi.5.scd b/doc/tofi.5.scd index dd92f39..696b06e 100644 --- a/doc/tofi.5.scd +++ b/doc/tofi.5.scd @@ -198,12 +198,11 @@ options. *scale*=_true|false_ Scale the window by the output's scale factor. - *WARNING*: In the next version of tofi, this will default to true, so - set this to false now if you don't want that behaviour. Note that - currently, font scaling will still occur when this is set to _false_ - - that will change when _true_ becomes the default. + *WARNING*: In the current version of tofi, the default value has changed to + true, so you may need to update your config. Additionally, font scaling will + no longer occur when this is set to _false_. - Default: false + Default: true *margin-top*=_px|%_ Offset from top of screen. See *PERCENTAGE VALUES* for more diff --git a/src/config.c b/src/config.c index e1a30b8..7e5fb6b 100644 --- a/src/config.c +++ b/src/config.c @@ -369,17 +369,10 @@ void config_fixup_values(struct tofi *tofi) { uint32_t scale = tofi->window.scale; - /* - * Scale fonts to the correct size. - * - * TODO: In the next release (0.6.0), this should be moved within - * the use_scale conditional. - */ - tofi->window.entry.font_size *= scale; - if (tofi->use_scale) { struct entry *entry = &tofi->window.entry; + tofi->window.entry.font_size *= scale; entry->prompt_padding *= scale; entry->corner_radius *= scale; entry->selection_background_padding *= scale; @@ -1024,6 +1024,7 @@ int main(int argc, char *argv[]) | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT, .use_history = true, .require_match = true, + .use_scale = true, }; wl_list_init(&tofi.output_list); diff --git a/themes/dmenu b/themes/dmenu index db480b8..55a23d9 100644 --- a/themes/dmenu +++ b/themes/dmenu @@ -1,6 +1,6 @@ anchor = top width = 100% -height = 60 +height = 30 horizontal = true font-size = 14 prompt-text = " run: " @@ -8,8 +8,8 @@ font = monospace outline-width = 0 border-width = 0 background-color = #000000 -min-input-width = 240 -result-spacing = 30 +min-input-width = 120 +result-spacing = 15 padding-top = 0 padding-bottom = 0 padding-left = 0 @@ -1,14 +1,14 @@ font = VT323 -corner-radius = 120 +corner-radius = 60 outline-color = #D3D1B9 -outline-width = 6 +outline-width = 3 border-color = #E3E1C9 -border-width = 120 +border-width = 60 background-color = #000000 text-color = #0A3 selection-color = #0F6 prompt-text = "C:\> " num-results = 9 hide-cursor = true -width = 1280 -height = 960 +width = 640 +height = 480 diff --git a/themes/fullscreen b/themes/fullscreen index 18b67b4..aa3a2cd 100644 --- a/themes/fullscreen +++ b/themes/fullscreen @@ -4,7 +4,7 @@ border-width = 0 outline-width = 0 padding-left = 35% padding-top = 35% -result-spacing = 50 +result-spacing = 25 num-results = 5 font = monospace background-color = #000A |