improv: don't resize column for caps lock and error text
This prevents the other column items from jumping around depending on if Caps Lock is toggled or if an error is shown. Now only the error text moves depending on if Caps Lock is toggled.
This commit is contained in:
Vukašin Vojinović
Jeremy Soller
parent
e606c447a3
commit
a7f8a62807
2 changed files with 43 additions and 22 deletions
|
|
@ -17,7 +17,7 @@ use cosmic::{
|
||||||
cosmic_config::{self, ConfigSet},
|
cosmic_config::{self, ConfigSet},
|
||||||
executor,
|
executor,
|
||||||
iced::{
|
iced::{
|
||||||
self, Background, Border, Length, Subscription, alignment,
|
self, Alignment, Background, Border, Length, Subscription,
|
||||||
event::wayland::OutputEvent,
|
event::wayland::OutputEvent,
|
||||||
futures::SinkExt,
|
futures::SinkExt,
|
||||||
platform_specific::{
|
platform_specific::{
|
||||||
|
|
@ -510,7 +510,10 @@ impl App {
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
let date_time_column = self.common.time.date_time_widget(military_time);
|
let date_time_column = self.common.time.date_time_widget(military_time);
|
||||||
|
|
||||||
let mut status_row = widget::row::with_capacity(2).padding(16.0).spacing(12.0);
|
let mut status_row = widget::row::with_capacity(2)
|
||||||
|
.padding(16.0)
|
||||||
|
.spacing(12.0)
|
||||||
|
.align_y(Alignment::Center);
|
||||||
|
|
||||||
if let Some(network_icon) = self.common.network_icon_opt.as_ref() {
|
if let Some(network_icon) = self.common.network_icon_opt.as_ref() {
|
||||||
status_row = status_row.push(network_icon.clone());
|
status_row = status_row.push(network_icon.clone());
|
||||||
|
|
@ -748,11 +751,11 @@ impl App {
|
||||||
widget::divider::horizontal::default().width(Length::Fixed(menu_width / 2. - 16.)),
|
widget::divider::horizontal::default().width(Length::Fixed(menu_width / 2. - 16.)),
|
||||||
button_row,
|
button_row,
|
||||||
])
|
])
|
||||||
.align_x(alignment::Horizontal::Left)
|
.align_x(Alignment::Start)
|
||||||
};
|
};
|
||||||
|
|
||||||
let right_element = {
|
let right_element = {
|
||||||
let mut column = widget::column::with_capacity(2)
|
let mut column = widget::column::with_capacity(5)
|
||||||
.spacing(12.0)
|
.spacing(12.0)
|
||||||
.max_width(280.0);
|
.max_width(280.0);
|
||||||
|
|
||||||
|
|
@ -778,7 +781,7 @@ impl App {
|
||||||
.height(Length::Fixed(78.0)),
|
.height(Length::Fixed(78.0)),
|
||||||
)
|
)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_x(alignment::Horizontal::Center),
|
.align_x(Alignment::Center),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
None => {}
|
None => {}
|
||||||
|
|
@ -786,7 +789,7 @@ impl App {
|
||||||
column = column.push(
|
column = column.push(
|
||||||
widget::container(widget::text::title4(&user_data.full_name))
|
widget::container(widget::text::title4(&user_data.full_name))
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_x(alignment::Horizontal::Center),
|
.align_x(Alignment::Center),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -848,6 +851,8 @@ impl App {
|
||||||
|
|
||||||
if self.common.caps_lock {
|
if self.common.caps_lock {
|
||||||
column = column.push(widget::text(fl!("caps-lock")));
|
column = column.push(widget::text(fl!("caps-lock")));
|
||||||
|
} else if self.common.error_opt.is_none() {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
|
|
@ -871,17 +876,24 @@ impl App {
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(error) = &self.common.error_opt {
|
if let Some(error) = &self.common.error_opt {
|
||||||
column = column.push(widget::text(error));
|
column = column.push(
|
||||||
|
widget::text(error)
|
||||||
|
.class(theme::Text::Color(iced::Color::from_rgb(1.0, 0.0, 0.0))),
|
||||||
|
);
|
||||||
|
if !self.common.caps_lock {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
}
|
}
|
||||||
|
|
||||||
widget::container(column)
|
widget::container(column)
|
||||||
.align_x(alignment::Horizontal::Center)
|
.align_x(Alignment::Center)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
};
|
};
|
||||||
let menu = widget::container(
|
let menu = widget::container(
|
||||||
widget::layer_container(
|
widget::layer_container(
|
||||||
iced::widget::row![left_element, right_element]
|
iced::widget::row![left_element, right_element].align_y(Alignment::Center),
|
||||||
.align_y(alignment::Alignment::Center),
|
|
||||||
)
|
)
|
||||||
.layer(cosmic::cosmic_theme::Layer::Background)
|
.layer(cosmic::cosmic_theme::Layer::Background)
|
||||||
.padding(16)
|
.padding(16)
|
||||||
|
|
@ -902,8 +914,8 @@ impl App {
|
||||||
.padding([32.0, 0.0, 0.0, 0.0])
|
.padding([32.0, 0.0, 0.0, 0.0])
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Shrink)
|
.height(Length::Shrink)
|
||||||
.align_x(alignment::Horizontal::Center)
|
.align_x(Alignment::Center)
|
||||||
.align_y(alignment::Vertical::Top);
|
.align_y(Alignment::Start);
|
||||||
|
|
||||||
let popover = widget::popover(menu).modal(true);
|
let popover = widget::popover(menu).modal(true);
|
||||||
match self.dialog_page_opt {
|
match self.dialog_page_opt {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use cosmic::surface;
|
||||||
use cosmic::{
|
use cosmic::{
|
||||||
Element, executor,
|
Element, executor,
|
||||||
iced::{
|
iced::{
|
||||||
self, Background, Border, Length, Subscription, alignment,
|
self, Alignment, Background, Border, Length, Subscription,
|
||||||
event::wayland::{OutputEvent, SessionLockEvent},
|
event::wayland::{OutputEvent, SessionLockEvent},
|
||||||
futures::{self, SinkExt},
|
futures::{self, SinkExt},
|
||||||
platform_specific::shell::wayland::commands::session_lock::{
|
platform_specific::shell::wayland::commands::session_lock::{
|
||||||
|
|
@ -414,7 +414,7 @@ impl App {
|
||||||
widget::divider::horizontal::default().width(Length::Fixed(menu_width / 2. - 16.)),
|
widget::divider::horizontal::default().width(Length::Fixed(menu_width / 2. - 16.)),
|
||||||
button_row,
|
button_row,
|
||||||
])
|
])
|
||||||
.align_x(alignment::Horizontal::Left)
|
.align_x(Alignment::Start)
|
||||||
};
|
};
|
||||||
|
|
||||||
let right_element = {
|
let right_element = {
|
||||||
|
|
@ -431,7 +431,7 @@ impl App {
|
||||||
.height(Length::Fixed(78.0)),
|
.height(Length::Fixed(78.0)),
|
||||||
)
|
)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_x(alignment::Horizontal::Center),
|
.align_x(Alignment::Center),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
None => {}
|
None => {}
|
||||||
|
|
@ -440,7 +440,7 @@ impl App {
|
||||||
column = column.push(
|
column = column.push(
|
||||||
widget::container(widget::text::title4(&self.flags.user_data.full_name))
|
widget::container(widget::text::title4(&self.flags.user_data.full_name))
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.align_x(alignment::Horizontal::Center),
|
.align_x(Alignment::Center),
|
||||||
);
|
);
|
||||||
|
|
||||||
match &self.common.prompt_opt {
|
match &self.common.prompt_opt {
|
||||||
|
|
@ -481,6 +481,8 @@ impl App {
|
||||||
|
|
||||||
if self.common.caps_lock {
|
if self.common.caps_lock {
|
||||||
column = column.push(widget::text(fl!("caps-lock")));
|
column = column.push(widget::text(fl!("caps-lock")));
|
||||||
|
} else if self.common.error_opt.is_none() {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
|
|
@ -491,18 +493,25 @@ impl App {
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(error) = &self.common.error_opt {
|
if let Some(error) = &self.common.error_opt {
|
||||||
column = column.push(widget::text(error));
|
column = column.push(
|
||||||
|
widget::text(error)
|
||||||
|
.class(theme::Text::Color(iced::Color::from_rgb(1.0, 0.0, 0.0))),
|
||||||
|
);
|
||||||
|
if !self.common.caps_lock {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
column = column.push(widget::text(""));
|
||||||
}
|
}
|
||||||
|
|
||||||
widget::container(column)
|
widget::container(column)
|
||||||
.align_x(alignment::Horizontal::Center)
|
.align_x(Alignment::Center)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
};
|
};
|
||||||
|
|
||||||
widget::container(
|
widget::container(
|
||||||
widget::layer_container(
|
widget::layer_container(
|
||||||
iced::widget::row![left_element, right_element]
|
iced::widget::row![left_element, right_element].align_y(Alignment::Center),
|
||||||
.align_y(alignment::Alignment::Center),
|
|
||||||
)
|
)
|
||||||
.layer(cosmic::cosmic_theme::Layer::Background)
|
.layer(cosmic::cosmic_theme::Layer::Background)
|
||||||
.padding(16)
|
.padding(16)
|
||||||
|
|
@ -523,8 +532,8 @@ impl App {
|
||||||
.padding([32.0, 0.0, 0.0, 0.0])
|
.padding([32.0, 0.0, 0.0, 0.0])
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
.align_x(alignment::Horizontal::Center)
|
.align_x(Alignment::Center)
|
||||||
.align_y(alignment::Vertical::Top)
|
.align_y(Alignment::Start)
|
||||||
.class(cosmic::theme::Container::Transparent)
|
.class(cosmic::theme::Container::Transparent)
|
||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue