leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #804 from pop-os/fix-desktop-active-tab

Browse source 
fix: set the active tab in desktop mode when the window is focused
This commit is contained in:
Jeremy Soller 2025-02-12 13:35:17 -07:00 • committed by GitHub
commit f63b0f097b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/app.rs
View file

@ -286,6 +286,8 @@ pub enum Message {
DialogUpdate(DialogPage), DialogUpdate(DialogPage),
DialogUpdateComplete(DialogPage), DialogUpdateComplete(DialogPage),
ExtractHere(Option<Entity>), ExtractHere(Option<Entity>),
#[cfg(all(feature = "desktop", feature = "wayland"))]
Focused(window::Id),
Key(Modifiers, Key), Key(Modifiers, Key),
LaunchUrl(String), LaunchUrl(String),
MaybeExit, MaybeExit,
@ -3516,6 +3518,15 @@ impl Application for App {
self.size = Some(size); self.size = Some(size);
self.handle_overlap(); self.handle_overlap();
} }
#[cfg(all(feature = "desktop", feature = "wayland"))]
Message::Focused(id) => {
if let Some(w) = self.windows.get(&id) {
match w {
WindowKind::Desktop(entity) => self.tab_model.activate(*entity),
_ => {}
};
}
}
} }
Task::none() Task::none()
@ -4506,6 +4517,8 @@ impl Application for App {
Some(Message::Modifiers(modifiers)) Some(Message::Modifiers(modifiers))
} }
Event::Window(WindowEvent::Unfocused) => Some(Message::WindowUnfocus), Event::Window(WindowEvent::Unfocused) => Some(Message::WindowUnfocus),
#[cfg(all(feature = "desktop", feature = "wayland"))]
Event::Window(WindowEvent::Focused) => Some(Message::Focused(window_id)),
Event::Window(WindowEvent::CloseRequested) => Some(Message::WindowClose), Event::Window(WindowEvent::CloseRequested) => Some(Message::WindowClose),
Event::Window(WindowEvent::Opened { position: _, size }) => { Event::Window(WindowEvent::Opened { position: _, size }) => {
Some(Message::Size(size)) Some(Message::Size(size))