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

fix: remove false searchbar placeholders

Browse source
This commit is contained in:
Doods 2025-12-20 20:22:49 +02:00 • committed by Michael Murphy
parent a345091d4f
commit 19f577c0ea
10 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-settings/src/pages/applications/startup_apps.rs
View file

@ -113,7 +113,7 @@ impl page::Page<crate::pages::Message> for Page {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> { fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
match &self.context { match &self.context {
Some(Context::AddApplication(directory_type)) => { Some(Context::AddApplication(directory_type)) => {
let search = widget::search_input(fl!("type-to-search"), &self.application_search) let search = widget::search_input("", &self.application_search)
.on_input(|i| Message::ApplicationSearch(i).into()) .on_input(|i| Message::ApplicationSearch(i).into())
.on_clear(Message::ApplicationSearch(String::new()).into()) .on_clear(Message::ApplicationSearch(String::new()).into())
.apply(Element::from); .apply(Element::from);

2
cosmic-settings/src/pages/desktop/appearance/font_config.rs
View file

@ -163,7 +163,7 @@ impl Model {
} }
pub fn search_input(&self) -> Element<'_, crate::pages::Message> { pub fn search_input(&self) -> Element<'_, crate::pages::Message> {
widget::search_input(fl!("type-to-search"), &self.font_search) widget::search_input("", &self.font_search)
.on_input(|input| Message::DrawerFont(drawer::FontMessage::Search(input))) .on_input(|input| Message::DrawerFont(drawer::FontMessage::Search(input)))
.on_clear(Message::DrawerFont(drawer::FontMessage::Search( .on_clear(Message::DrawerFont(drawer::FontMessage::Search(
String::new(), String::new(),

3
cosmic-settings/src/pages/desktop/appearance/mod.rs
View file

@ -598,7 +598,8 @@ impl Page {
}); });
if let Some(dock_config_helper) = dock_config_helper.as_ref() if let Some(dock_config_helper) = dock_config_helper.as_ref()
&& let Some(dock_config) = dock_config.as_mut() { && let Some(dock_config) = dock_config.as_mut()
{
let padding = match roundness { let padding = match roundness {
Roundness::Round => 4, Roundness::Round => 4,
Roundness::SlightlyRound => 4, Roundness::SlightlyRound => 4,

3
cosmic-settings/src/pages/display/mod.rs
View file

@ -556,7 +556,8 @@ impl Page {
} }
if let Some(v) = self.mirror_map.get(k) if let Some(v) = self.mirror_map.get(k)
&& v.equivalent(&self.active_display) { && v.equivalent(&self.active_display)
{
if let Some(output) = self.list.outputs.get(k) { if let Some(output) = self.list.outputs.get(k) {
return self.exec_randr(output, Randr::Toggle(true)); return self.exec_randr(output, Randr::Toggle(true));
} else { } else {

2
cosmic-settings/src/pages/input/keyboard/mod.rs
View file

@ -281,7 +281,7 @@ impl page::Page<crate::pages::Message> for Page {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> { fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
self.context.as_ref().map(|context| match context { self.context.as_ref().map(|context| match context {
Context::ShowInputSourcesContext => { Context::ShowInputSourcesContext => {
let search = widget::search_input(fl!("type-to-search"), &self.input_source_search) let search = widget::search_input("", &self.input_source_search)
.on_input(Message::InputSourceSearch) .on_input(Message::InputSourceSearch)
.on_clear(Message::InputSourceSearch(String::new())) .on_clear(Message::InputSourceSearch(String::new()))
.apply(Element::from) .apply(Element::from)

2
cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
View file

@ -433,7 +433,7 @@ fn shortcuts() -> Section<crate::pages::Message> {
.view::<Page>(move |_binder, page, section| { .view::<Page>(move |_binder, page, section| {
let descriptions = &section.descriptions; let descriptions = &section.descriptions;
let search = widget::search_input(fl!("type-to-search"), &page.search.input) let search = widget::search_input("", &page.search.input)
.width(314) .width(314)
.on_clear(Message::Search(String::new())) .on_clear(Message::Search(String::new()))
.on_input(Message::Search) .on_input(Message::Search)

5
cosmic-settings/src/pages/networking/vpn/mod.rs
View file

@ -651,10 +651,7 @@ impl Page {
"username".to_string(), "username".to_string(),
username.clone().unwrap_or_default().into(), username.clone().unwrap_or_default().into(),
), ),
( ("password".to_string(), password.clone()),
"password".to_string(),
password.clone(),
),
]), ]),
applied_tx, applied_tx,
}) })

6
cosmic-settings/src/pages/sound/mod.rs
View file

@ -217,7 +217,8 @@ impl Page {
self.amplification_sink = enabled; self.amplification_sink = enabled;
if let Some(config) = &self.sound_config if let Some(config) = &self.sound_config
&& let Err(why) = config.set(AMPLIFICATION_SINK, enabled) { && let Err(why) = config.set(AMPLIFICATION_SINK, enabled)
{
tracing::error!(?why, "Failed to save over amplification setting"); tracing::error!(?why, "Failed to save over amplification setting");
} }
} }
@ -226,7 +227,8 @@ impl Page {
self.amplification_source = enabled; self.amplification_source = enabled;
if let Some(config) = &self.sound_config if let Some(config) = &self.sound_config
&& let Err(why) = config.set(AMPLIFICATION_SOURCE, enabled) { && let Err(why) = config.set(AMPLIFICATION_SOURCE, enabled)
{
tracing::error!(?why, "Failed to save over amplification setting"); tracing::error!(?why, "Failed to save over amplification setting");
} }
} }

2
cosmic-settings/src/pages/time/date.rs
View file

@ -175,7 +175,7 @@ impl page::Page<crate::pages::Message> for Page {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> { fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
if self.timezone_context { if self.timezone_context {
let search = widget::search_input(fl!("type-to-search"), &self.timezone_search) let search = widget::search_input("", &self.timezone_search)
.on_input(Message::TimezoneSearch) .on_input(Message::TimezoneSearch)
.on_clear(Message::TimezoneSearch(String::new())) .on_clear(Message::TimezoneSearch(String::new()))
.apply(Element::from) .apply(Element::from)

4
cosmic-settings/src/pages/time/region.rs
View file

@ -160,7 +160,7 @@ impl page::Page<crate::pages::Message> for Page {
fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> { fn context_drawer(&self) -> Option<ContextDrawer<'_, crate::pages::Message>> {
Some(match self.context.as_ref()? { Some(match self.context.as_ref()? {
ContextView::AddLanguage => { ContextView::AddLanguage => {
let search = widget::search_input(fl!("type-to-search"), &self.add_language_search) let search = widget::search_input("", &self.add_language_search)
.on_input(Message::AddLanguageSearch) .on_input(Message::AddLanguageSearch)
.on_clear(Message::AddLanguageSearch(String::new())) .on_clear(Message::AddLanguageSearch(String::new()))
.apply(Element::from) .apply(Element::from)
@ -183,7 +183,7 @@ impl page::Page<crate::pages::Message> for Page {
.footer(install_additional_button) .footer(install_additional_button)
} }
ContextView::Region => { ContextView::Region => {
let search = widget::search_input(fl!("type-to-search"), &self.add_language_search) let search = widget::search_input("", &self.add_language_search)
.on_input(Message::AddLanguageSearch) .on_input(Message::AddLanguageSearch)
.on_clear(Message::AddLanguageSearch(String::new())) .on_clear(Message::AddLanguageSearch(String::new()))
.apply(Element::from) .apply(Element::from)