Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dpi scaling of minimum_width & maximum_width #1926

Merged
merged 1 commit into from
May 22, 2024

Conversation

Caellian
Copy link
Collaborator

This was left over from #1877.

This was left over from #1877.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
@github-actions github-actions bot added sources PR modifies project sources display: x11 Issue related to X11 backend display: wayland Issue related to Wayland backend labels May 18, 2024
Copy link

netlify bot commented May 18, 2024

Deploy Preview for conkyweb canceled.

Name Link
🔨 Latest commit 72a5c1a
🔍 Latest deploy log https://app.netlify.com/sites/conkyweb/deploys/66492fa5a014600008f810d4

@Caellian Caellian changed the title Cleanup remaining dpi scaling of min & max width Remove dpi scaling of minimum_width & maximum_width May 18, 2024
@@ -661,8 +661,8 @@ bool display_output_wayland::main_loop_wait(double t) {
text_size.y() + 2 * border_total != height || scale_changed)) {
/* clamp text_width to configured maximum */
if (maximum_width.get(*state)) {
int mw = global_window->scale * maximum_width.get(*state);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't remove maximum_width scaling here.

text_size = conky::vec2i(dpi_scale(minimum_width.get(*state)), 0);
text_size = conky::vec2i(minimum_width.get(*state), 0);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minimum_width shouldn't scale either.

@Caellian
Copy link
Collaborator Author

Caellian commented May 18, 2024

Next step would be reverting these changes 😆, introducing proper unit support, and making raw numbers default to pt instead of px as most users expect (#1925).

@brndnmtthws brndnmtthws added the bug Bug report or bug fix PR label May 20, 2024
@Caellian Caellian merged commit 7526e7e into main May 22, 2024
63 checks passed
@Caellian Caellian deleted the fix/cleanup-minmax-width branch May 22, 2024 12:52
Caellian added a commit that referenced this pull request May 30, 2024
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
Caellian added a commit that referenced this pull request Jun 1, 2024
Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug report or bug fix PR display: wayland Issue related to Wayland backend display: x11 Issue related to X11 backend sources PR modifies project sources
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants