Fix minimum_height not scaled with dpi_scale like minimum_width (#1980)

agorgl · web-flow · commit 49ca67d1ab92 · 2024-07-04T04:32:43.000Z
diff --git a/src/conky.cc b/src/conky.cc
@@ -862,7 +862,7 @@ void update_text_area() {
     last_font_height = font_height();
     for_each_line(text_buffer, text_size_updater);
 
-    text_size = text_size.max(conky::vec2i(text_size.x() + 1, minimum_height.get(*state)));
+    text_size = text_size.max(conky::vec2i(text_size.x() + 1, dpi_scale(minimum_height.get(*state))));
     int mw = dpi_scale(maximum_width.get(*state));
     if (mw > 0) text_size = text_size.min(conky::vec2i(mw, text_size.y()));
   }

Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,7 @@ void update_text_area() {`
`862`	`862`	`last_font_height = font_height();`
`863`	`863`	`for_each_line(text_buffer, text_size_updater);`
`864`	`864`
`865`		`- text_size = text_size.max(conky::vec2i(text_size.x() + 1, minimum_height.get(*state)));`
	`865`	`+ text_size = text_size.max(conky::vec2i(text_size.x() + 1, dpi_scale(minimum_height.get(*state))));`
`866`	`866`	`int mw = dpi_scale(maximum_width.get(*state));`
`867`	`867`	`if (mw > 0) text_size = text_size.min(conky::vec2i(mw, text_size.y()));`
`868`	`868`	`}`