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

C++: if a SLINT_SCALE_FACTOR is set at compile time, default to that #5016

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ogoffart
Copy link
Member

@ogoffart ogoffart commented Apr 4, 2024

No description provided.

@ogoffart ogoffart requested a review from tronical April 4, 2024 13:44
Copy link
Member

@tronical tronical left a comment

Choose a reason for hiding this comment

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

Some thoughts about a cmake integration, but I think this is mostly for internal use for us anyway - so we could also just go with it.

// ESP_LOGI(TAG, "x: %i, y: %i", touchpad_x[0], touchpad_y[0]);
last_touch_x = touchpad_x[0];
last_touch_y = touchpad_y[0];
last_touch_x = float(touchpad_x[0]) / scale_factor;
Copy link
Member

Choose a reason for hiding this comment

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

Good catch

@@ -185,6 +185,14 @@ pub unsafe extern "C" fn slint_window_adapter_new(
set_position,
});

if let Some(scale_factor) =
option_env!("SLINT_SCALE_FACTOR").and_then(|x| x.parse::<f32>().ok()).filter(|f| *f > 0.)
Copy link
Member

Choose a reason for hiding this comment

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

Isn't that a little dangerous for regular C++ users? Or is it safe because it'll be overridden anyway later when a windowing system is used?

I guess ideally this would be a cmake cache variable that - if set - maps to an environment variable set for corrosion to pass to cargo. Maybe the cache variable could still be called SLINT_SCALE_FACTOR but the environment variable would be CMAKE_SLINT_SCALE_FACTOR.

Copy link
Member Author

Choose a reason for hiding this comment

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

If the C++ programmer set a C++ scale factor at runtime, it will be overridden.
But you're right that this probably should be a cmake setting rather than a env variable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants