mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-21 10:01:42 +01:00
Merge pull request #2419 from haranishi/fix/10102-raw-window-placement
Remember the native Raw Develop window placement
This commit is contained in:
6 files changed
+111
-10
No files matched your search
Generated
+2
@@ -3005,6 +3005,8 @@ dependencies = [
|
||||
"craft-keymap",
|
||||
"craft-theme",
|
||||
"craft-ui",
|
||||
"craft-ui-test-kit",
|
||||
"craft-window",
|
||||
"egui",
|
||||
"egui_kittest",
|
||||
"kurbo",
|
||||
|
||||
@@ -38,6 +38,8 @@ serde_json = { workspace = true, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
craft-ui = { workspace = true, features = ["testing"] }
|
||||
craft-ui-test-kit = { workspace = true }
|
||||
craft-window = { workspace = true }
|
||||
egui = { workspace = true }
|
||||
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
|
||||
|
||||
@@ -548,6 +548,7 @@ impl FullWindowWorkspace for RawDevelopWorkspace {
|
||||
|
||||
let shown = FullWindowDialog::new(title)
|
||||
.own_window(WindowSpec::dialog())
|
||||
.remember(SaveKey::new("craft_imaging.raw_develop.window"))
|
||||
.opened(open)
|
||||
.command_scope(RawDevelopCommands::SCOPE)
|
||||
.buttons(buttons)
|
||||
|
||||
@@ -2,11 +2,13 @@
|
||||
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::rc::Rc;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::Duration;
|
||||
|
||||
use craft_behavior::PixelSize;
|
||||
use craft_behavior::placement::Placement;
|
||||
use craft_behavior::{Monitor, MonitorKey, PixelSize};
|
||||
use craft_host::target::ShellInfo;
|
||||
use craft_imaging::raw::{Demosaic, RawDevelopSettings};
|
||||
use craft_imaging::scopes::ClippingMask;
|
||||
use craft_imaging::ui::raw_develop::{
|
||||
@@ -15,13 +17,17 @@ use craft_imaging::ui::raw_develop::{
|
||||
use craft_imaging::ui::scopes::{ScopeFrame, ScopeReadout};
|
||||
use craft_imaging::ui::wide_angle::PreviewDone;
|
||||
use craft_imaging::ui::{ChannelColor, HistogramSet, ScopeChannel};
|
||||
use craft_ui::InstallSpec;
|
||||
use craft_ui::canvas::{PixelRect, RasterSource};
|
||||
use craft_ui::dialog::{DialogHost, DialogResult, FullWindowWorkspace as _, HostedWorkspace};
|
||||
use craft_ui::primitives::Revision;
|
||||
use craft_ui::runtime::access::Role;
|
||||
use craft_ui::runtime::pending::Job;
|
||||
use craft_ui::testing::windows::{FakeSystem, NoWindows};
|
||||
use craft_ui::testing::{Fixture, Target, pointer, trial};
|
||||
use egui::{Color32, ColorImage, Event, Key, Modifiers, Vec2, pos2};
|
||||
use craft_ui_test_kit::windows::Windows;
|
||||
use craft_window::restore::Store;
|
||||
use egui::{Color32, ColorImage, Event, Key, Modifiers, Rect, Vec2, ViewportId, ViewportInfo, pos2};
|
||||
|
||||
const IMAGE: [u32; 2] = [400, 200];
|
||||
|
||||
@@ -172,6 +178,79 @@ fn focus_canvas(fixture: &mut Fixture) -> Target {
|
||||
canvas
|
||||
}
|
||||
|
||||
#[trial]
|
||||
fn raw_develop_remembers_its_native_window_between_open_and_filter() {
|
||||
let store = Arc::new(Mutex::new(Store::in_memory()));
|
||||
let context = || Windows::with(InstallSpec::new(ShellInfo::default(), Arc::new(NoWindows)).placement(store.clone()));
|
||||
let first = context();
|
||||
let mut host = DialogHost::new();
|
||||
host.open(HostedWorkspace::new(RawDevelopWorkspace::new(open(RawTarget::OpenRaw)), Source::new()));
|
||||
|
||||
let inner_size = Vec2::new(1040.0, 760.0);
|
||||
let outer_pos = pos2(118.0, 60.0);
|
||||
first.child_info(ViewportInfo {
|
||||
inner_rect: Some(Rect::from_min_size(pos2(120.0, 90.0), inner_size)),
|
||||
outer_rect: Some(Rect::from_min_size(outer_pos, inner_size + Vec2::new(4.0, 32.0))),
|
||||
native_pixels_per_point: Some(2.0),
|
||||
..ViewportInfo::default()
|
||||
});
|
||||
for _ in 0..3 {
|
||||
first.frame(vec![], vec![], |ui| {
|
||||
host.run(ui);
|
||||
});
|
||||
}
|
||||
let saved = store.lock().unwrap().get("craft_imaging.raw_develop.window").expect("the Raw Develop window's placement was saved");
|
||||
assert_eq!(saved.normal.size, <[f32; 2]>::from(inner_size));
|
||||
assert_eq!(saved.position_px, Some([236, 120]));
|
||||
|
||||
// Windows can report a parked rectangle just before the minimized window stops painting.
|
||||
let parked = Rect::from_min_size(pos2(-32000.0, -32000.0), Vec2::new(160.0, 40.0));
|
||||
first.child_info(ViewportInfo {
|
||||
inner_rect: Some(parked),
|
||||
outer_rect: Some(parked),
|
||||
native_pixels_per_point: Some(2.0),
|
||||
minimized: Some(true),
|
||||
..ViewportInfo::default()
|
||||
});
|
||||
first.frame(vec![], vec![], |ui| {
|
||||
host.run(ui);
|
||||
});
|
||||
assert_eq!(store.lock().unwrap().get("craft_imaging.raw_develop.window"), Some(saved), "minimizing keeps the normal placement");
|
||||
|
||||
let second = context();
|
||||
let mut host = DialogHost::new();
|
||||
host.open(HostedWorkspace::new(RawDevelopWorkspace::new(open(RawTarget::Filter)), Source::new()));
|
||||
let output = second.frame(vec![], vec![], |ui| {
|
||||
host.run(ui);
|
||||
});
|
||||
let (_, builder) = output.builders.iter().find(|(id, _)| *id != ViewportId::ROOT).expect("Raw Develop Filter opens a child window");
|
||||
assert_eq!(builder.inner_size, Some(inner_size));
|
||||
assert_eq!(builder.position, Some(outer_pos));
|
||||
}
|
||||
|
||||
#[trial]
|
||||
fn raw_develop_window_keeps_its_size_when_the_saved_screen_is_gone() {
|
||||
let store = Arc::new(Mutex::new(Store::in_memory()));
|
||||
let mut saved = Placement::new([1040.0, 760.0], 2.0);
|
||||
saved.position_px = Some([-4400, 120]);
|
||||
saved.monitor = Some(MonitorKey::new("Disconnected", [3840, 2160]));
|
||||
store.lock().unwrap().set("craft_imaging.raw_develop.window", &saved);
|
||||
|
||||
let screen = Monitor::new(MonitorKey::new("Attached", [3840, 2160]), [0, 0], [3840, 2160], 2.0);
|
||||
let system = Arc::new(FakeSystem::new());
|
||||
system.set_monitors(vec![screen]);
|
||||
let windows = Windows::with(InstallSpec::new(ShellInfo::default(), system).placement(store));
|
||||
let mut host = DialogHost::new();
|
||||
host.open(HostedWorkspace::new(RawDevelopWorkspace::new(open(RawTarget::OpenRaw)), Source::new()));
|
||||
let output = windows.frame(vec![], vec![], |ui| {
|
||||
host.run(ui);
|
||||
});
|
||||
let (_, builder) = output.builders.iter().find(|(id, _)| *id != ViewportId::ROOT).expect("Raw Develop opens a child window");
|
||||
assert_eq!(builder.inner_size, Some(Vec2::new(1040.0, 760.0)));
|
||||
let pos = builder.position.expect("the recovered position is on the attached screen");
|
||||
assert!((0.0..=880.0).contains(&pos.x) && (0.0..=320.0).contains(&pos.y), "restored position is in reach: {pos:?}");
|
||||
}
|
||||
|
||||
#[trial]
|
||||
fn raw_develop_switches_raws_and_finishes_with_each_footer_button() {
|
||||
let host = Rc::new(RefCell::new(DialogHost::new()));
|
||||
|
||||
@@ -22,6 +22,10 @@ pub(crate) fn save_placement(ctx: &Context, key: &str, placement: &Placement) {
|
||||
|
||||
/// Keeps the window's placement in the store, as [`placement_of`] records it.
|
||||
pub(super) fn record_placement(ctx: &Context, viewport: ViewportId, key: &str, facts: &viewports::Facts) {
|
||||
// Some systems report a parked rectangle for a minimized window.
|
||||
if facts.minimized {
|
||||
return;
|
||||
}
|
||||
let Some(inner) = facts.inner else { return };
|
||||
let geometry = Geometry { inner, outer: facts.outer, scale: facts.native_scale, maximized: facts.maximized, fullscreen: facts.fullscreen };
|
||||
let unchanged = PerViewport::<Record>::with(ctx, viewport, |record| record.placed.replace(geometry) == Some(geometry));
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
//! Viewport mounts: opening a mount's OS viewport and its close requests.
|
||||
|
||||
use super::host::monitors;
|
||||
use super::native::{WindowAction, act, route_hit_test};
|
||||
use super::placement::{record_placement, saved_placement};
|
||||
use super::shell::{app_id, os_of, refresh};
|
||||
use super::shell::{app_id, base_shell, os_of, refresh};
|
||||
use super::spec::{WindowSpec, frame_of_spec};
|
||||
use super::{Record, refuse_close_under_modal, shared};
|
||||
use crate::runtime::egui::viewports;
|
||||
use crate::runtime::frame::PerViewport;
|
||||
use craft_behavior::placement::{Defaults, place};
|
||||
use craft_host::target::{Os, WindowChrome, WindowKind};
|
||||
use egui::{Context, Id, Pos2, Rect, Ui, Vec2, ViewportId};
|
||||
|
||||
@@ -45,13 +47,9 @@ pub(crate) struct ViewportOpen<'a> {
|
||||
/// resizable window's size goes out only to open it (`ViewportOpen::follows_size`).
|
||||
pub(crate) fn show_viewport(ctx: &Context, open: &ViewportOpen<'_>, mut body: impl FnMut(&mut Ui)) {
|
||||
let viewport = viewports::viewport_id(open.id);
|
||||
let saved = open.save.and_then(|key| saved_placement(ctx, key));
|
||||
let (size, pos) = match &saved {
|
||||
Some(placement) => (Some(Vec2::from(placement.normal.size)), placement.position().map(Pos2::from)),
|
||||
None => (open.size, None),
|
||||
};
|
||||
let pos = pos.or(open.position);
|
||||
let opened = PerViewport::<Record>::with(ctx, viewport, |record| record.seen.is_some());
|
||||
let (size, pos) = saved_geometry(ctx, open, opened).map_or((open.size, None), |(size, pos)| (Some(size), pos));
|
||||
let pos = pos.or(open.position);
|
||||
if opened {
|
||||
keep_placed(ctx, viewport, pos, size.filter(|_| open.follows_size));
|
||||
}
|
||||
@@ -121,6 +119,21 @@ pub(crate) fn show_viewport(ctx: &Context, open: &ViewportOpen<'_>, mut body: im
|
||||
}
|
||||
}
|
||||
|
||||
/// Fits saved geometry to the current display layout once, before the viewport opens.
|
||||
fn saved_geometry(ctx: &Context, open: &ViewportOpen<'_>, opened: bool) -> Option<(Vec2, Option<Pos2>)> {
|
||||
let saved = saved_placement(ctx, open.save?)?.repaired()?;
|
||||
let positions = base_shell(ctx).window_positions();
|
||||
let placement = if opened {
|
||||
saved
|
||||
} else {
|
||||
let min = open.limits.0.map_or([1.0; 2], Into::into);
|
||||
let defaults = Defaults::new(saved.normal.size, min).with_no_position(!positions);
|
||||
place(Some(&saved), &monitors(ctx), None, &defaults)
|
||||
};
|
||||
let pos = placement.position().filter(|_| positions).map(Pos2::from);
|
||||
Some((placement.normal.size.into(), pos))
|
||||
}
|
||||
|
||||
/// Whether the OS asked the viewport of container `id` to close in this root frame; once.
|
||||
pub(crate) fn take_close_request(ctx: &Context, id: Id) -> bool {
|
||||
shared(ctx, |shared| {
|
||||
|
||||
Reference in new issue
Block a user