Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-16 04:02:15 +00:00
Code Issues Releases Activity

Cleanup remaining dpi scaling of min & max width (#1926)

Browse Source 
This was left over from #1877.
This commit is contained in:
Tin Švagelj 2024-05-22 14:52:49 +02:00 committed by GitHub
parent 682db0c4df
commit 7526e7e18d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conky.cc
View File

@ -858,7 +858,7 @@ void update_text_area() {
if (fixed_size == 0) if (fixed_size == 0)
#endif #endif
{ {
text_size = conky::vec2i(dpi_scale(minimum_width.get(*state)), 0); text_size = conky::vec2i(minimum_width.get(*state), 0);
last_font_height = font_height(); last_font_height = font_height();
for_each_line(text_buffer, text_size_updater); for_each_line(text_buffer, text_size_updater);
text_size += conky::vec2i::UnitX(); text_size += conky::vec2i::UnitX();
@ -984,7 +984,7 @@ static int text_size_updater(char *s, int special_index) {
if (w > text_size.x()) { text_size.set_x(w); } if (w > text_size.x()) { text_size.set_x(w); }
int mw = maximum_width.get(*state); int mw = maximum_width.get(*state);
if (text_size.x() > mw && mw > 0) { text_size.set_x(mw); } if (mw > 0) { text_size.set_x(std::min(mw, text_size.x())); }
text_size += conky::vec2i(0, last_font_height); text_size += conky::vec2i(0, last_font_height);
last_font_height = font_height(); last_font_height = font_height();

4
src/display-wayland.cc
View File

@ -661,8 +661,8 @@ bool display_output_wayland::main_loop_wait(double t) {
text_size.y() + 2 * border_total != height || scale_changed)) { text_size.y() + 2 * border_total != height || scale_changed)) {
/* clamp text_width to configured maximum */ /* clamp text_width to configured maximum */
if (maximum_width.get(*state)) { if (maximum_width.get(*state)) {
int mw = global_window->scale * maximum_width.get(*state); int mw = maximum_width.get(*state);
if (text_size.x() > mw && mw > 0) { text_size.set_x(mw); } if (mw > 0) { text_size.set_x(std::min(mw, text_size.x())); }
} }
/* pending scale will be applied by resizing the window */ /* pending scale will be applied by resizing the window */

2
src/display-x11.cc
View File

@ -666,7 +666,7 @@ bool handle_event<x_event_handler::CONFIGURE>(
// don't apply dpi scaling to max pixel size // don't apply dpi scaling to max pixel size
int mw = maximum_width.get(*state); int mw = maximum_width.get(*state);
if (text_size.x() > mw && mw > 0) { text_size.set_x(mw); } if (mw > 0) { text_size.set_x(std::min(mw, text_size.x())); }
} }
/* if position isn't what expected, set fixed pos /* if position isn't what expected, set fixed pos