mirror of
https://github.com/horizon-rust/horizon.git
synced 2026-11-13 20:13:13 -10:00
Merge pull request #9809 from voidsipp/fix/9742-account-refresh
🤖 Agent: Only the glass look changes: the actions move under the profile and wrap inside the 400 px card, and Night keeps its row through the same `slot_row`. Launcher fmt, clippy and 674 tests pass on the desktop with this head merged into main.
This commit is contained in:
1 file changed
+21
-2
+21
-2
@@ -2641,6 +2641,25 @@ fn slot_row(
|
||||
.children(right)
|
||||
}
|
||||
|
||||
/// Microsoft account actions go below the profile in the fixed-width glass card.
|
||||
fn account_row(
|
||||
slot: Option<Div>,
|
||||
name: impl IntoElement,
|
||||
detail: Option<AnyElement>,
|
||||
actions: Div,
|
||||
t: &Theme,
|
||||
) -> Div {
|
||||
if glass_ui::flat() {
|
||||
return div()
|
||||
.flex()
|
||||
.flex_col()
|
||||
.min_w_0()
|
||||
.child(slot_row(slot, name, detail, None, t))
|
||||
.child(actions.flex_wrap().px(px(16.)).pb(px(12.)));
|
||||
}
|
||||
slot_row(slot, name, detail, Some(actions.into_any_element()), t)
|
||||
}
|
||||
|
||||
/// A plate that stands apart from the page: notices, the console, the agents note.
|
||||
fn plate(t: &Theme) -> Div {
|
||||
blocks::panel(t)
|
||||
@@ -4466,7 +4485,7 @@ impl Launcher {
|
||||
}))
|
||||
});
|
||||
n += 1;
|
||||
rows = rows.child(slot_row(
|
||||
rows = rows.child(account_row(
|
||||
Some(self.profile_heads.draw(Some(&a.uuid), 32., self.scale, &t)),
|
||||
a.name.clone(),
|
||||
Some(
|
||||
@@ -4484,7 +4503,7 @@ impl Launcher {
|
||||
})
|
||||
.into_any_element(),
|
||||
),
|
||||
Some(actions.into_any_element()),
|
||||
actions,
|
||||
&t,
|
||||
));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user