language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-31 07:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backends: don't resize the WindowItem in set_visible

Browse source 
We already query the size right after the call to set_visible in the
WindowInner::show()
This commit is contained in:
Olivier Goffart 2023-08-24 13:15:28 +02:00 • committed by GitHub
parent ff3ca79258
commit 541e7137c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/cpp/include/slint-platform.h
View file

@ -86,8 +86,6 @@ private:
/// slint::platform::AbstractRenderer &renderer() override { return m_renderer; } /// slint::platform::AbstractRenderer &renderer() override { return m_renderer; }
/// void set_visible(bool v) override { /// void set_visible(bool v) override {
/// if (v) { /// if (v) {
/// window().dispatch_resize_event(slint::LogicalSize(
/// { float(m_native_window.width), float(m_native_window.height) }));
/// m_native_window.show(); /// m_native_window.show();
/// } else { /// } else {
/// m_native_window.hide(); /// m_native_window.hide();
@ -148,8 +146,8 @@ public:
/// ///
/// Re-implement this function to forward the call to show/hide the native window /// Re-implement this function to forward the call to show/hide the native window
/// ///
/// When the window becomes visible, this is a good place to send /// When the window becomes visible, this is a good time to call
/// slint::Window::dispatch_resize_event and slint::Window::dispatch_scale_factor_change_event /// slint::Window::dispatch_scale_factor_change_event to initialise the scale factor.
virtual void set_visible(bool) { } virtual void set_visible(bool) { }
/// This function is called when Slint detects that the window need to be repainted. /// This function is called when Slint detects that the window need to be repainted.

9
internal/backends/linuxkms/fullscreenwindowadapter.rs
View file

@ -50,16 +50,11 @@ impl WindowAdapter for FullscreenWindowAdapter {
fn set_visible(&self, visible: bool) -> Result<(), PlatformError> { fn set_visible(&self, visible: bool) -> Result<(), PlatformError> {
if visible { if visible {
let scale_factor = if let Some(scale_factor) = if let Some(scale_factor) =
std::env::var("SLINT_SCALE_FACTOR").ok().and_then(|sf| sf.parse().ok()) std::env::var("SLINT_SCALE_FACTOR").ok().and_then(|sf| sf.parse().ok())
{ {
self.window.dispatch_event(WindowEvent::ScaleFactorChanged { scale_factor }); self.window.dispatch_event(WindowEvent::ScaleFactorChanged { scale_factor });
scale_factor }
} else {
1.0
};
let size = self.size().to_logical(scale_factor);
self.window.dispatch_event(WindowEvent::Resized { size });
} }
Ok(()) Ok(())
} }

18
internal/backends/qt/qt_window.rs
View file

@ -15,7 +15,7 @@ use i_slint_core::input::{KeyEventType, KeyInputEvent, MouseEvent};
use i_slint_core::item_rendering::{ItemCache, ItemRenderer}; use i_slint_core::item_rendering::{ItemCache, ItemRenderer};
use i_slint_core::items::{ use i_slint_core::items::{
self, FillRule, ImageRendering, Item, ItemRc, ItemRef, Layer, MouseCursor, Opacity, self, FillRule, ImageRendering, Item, ItemRc, ItemRef, Layer, MouseCursor, Opacity,
PointerEventButton, RenderingResult, TextOverflow, TextWrap, WindowItem, PointerEventButton, RenderingResult, TextOverflow, TextWrap,
}; };
use i_slint_core::layout::Orientation; use i_slint_core::layout::Orientation;
use i_slint_core::lengths::{ use i_slint_core::lengths::{
@ -1515,22 +1515,6 @@ impl WindowAdapter for QtWindow {
fn set_visible(&self, visible: bool) -> Result<(), PlatformError> { fn set_visible(&self, visible: bool) -> Result<(), PlatformError> {
if visible { if visible {
let component_rc = WindowInner::from_pub(&self.window).component();
let component = ComponentRc::borrow_pin(&component_rc);
let root_item = component.as_ref().get_item_ref(0);
if let Some(window_item) = ItemRef::downcast_pin::<WindowItem>(root_item) {
if window_item.width() <= LogicalLength::zero() {
window_item.width.set(LogicalLength::new(
component.as_ref().layout_info(Orientation::Horizontal).preferred_bounded(),
))
}
if window_item.height() <= LogicalLength::zero() {
window_item.height.set(LogicalLength::new(
component.as_ref().layout_info(Orientation::Vertical).preferred_bounded(),
))
}
}
let widget_ptr = self.widget_ptr(); let widget_ptr = self.widget_ptr();
let fullscreen = std::env::var("SLINT_FULLSCREEN").is_ok(); let fullscreen = std::env::var("SLINT_FULLSCREEN").is_ok();
cpp! {unsafe [widget_ptr as "QWidget*", fullscreen as "bool"] { cpp! {unsafe [widget_ptr as "QWidget*", fullscreen as "bool"] {