Skip to content

fix: add scrollable wrapper to device views #586

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.

Sign up for GitHub

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

Open
debarkak wants to merge 1 commit into
base: linux/rust
Choose a base branch
from
+15 −9
Open

fix: add scrollable wrapper to device views #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux-rust/src/ui/airpods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ pub fn airpods_view<'a>(
])
.padding(20)
.center_x(Length::Fill)
.height(Length::Fill)
.height(Length::Shrink)
}

fn run_async_in_thread<F>(fut: F)
Expand Down
2 changes: 1 addition & 1 deletion linux-rust/src/ui/nothing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ pub fn nothing_view<'a>(
])
.padding(20)
.center_x(Length::Fill)
.height(Length::Fill)
.height(Length::Shrink)
}

fn run_async_in_thread<F>(fut: F)
Expand Down
20 changes: 13 additions & 7 deletions linux-rust/src/ui/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,12 +871,16 @@ impl App {
match state {
DeviceState::AirPods(state) => {
device_managers.get(id).and_then(|managers| {
managers.get_aacp().map(|aacp_manager| airpods_view(
id,
&devices_list,
state,
aacp_manager.clone()
))
managers.get_aacp().map(|aacp_manager| {
let view = airpods_view(
id,
&devices_list,
state,
aacp_manager.clone(),
);
container(scrollable(view).height(Length::Fill))
.height(Length::Fill)
})
})
}
_ => None,
Expand All @@ -893,7 +897,9 @@ impl App {
if let Some(DeviceState::Nothing(state)) = device_state {
if let Some(device_managers) = device_managers.get(id) {
if let Some(att_manager) = device_managers.get_att() {
nothing_view(id, &devices_list, state, att_manager.clone())
let view = nothing_view(id, &devices_list, state, att_manager.clone());
container(scrollable(view).height(Length::Fill))
.height(Length::Fill)
} else {
error!("No ATT manager found for Nothing device {}", id);
container(
Expand Down