Merge remote-tracking branch 'upstream/master' into yoda-dock-magnification
# Conflicts: # Cargo.lock # Cargo.toml # cosmic-app-list/src/app.rs # cosmic-applet-audio/src/lib.rs # cosmic-applet-input-sources/Cargo.toml # cosmic-applet-input-sources/src/lib.rs # cosmic-applet-status-area/src/components/app.rs # cosmic-panel-button/src/lib.rs
This commit is contained in:
commit
673547dc52
119 changed files with 2247 additions and 1190 deletions
|
|
@ -0,0 +1 @@
|
|||
datetime-settings = Configuració de data, hora i calendari...
|
||||
|
|
@ -1 +1 @@
|
|||
datetime-settings = Datum, Uhrzeit und Kalendereinstellungen...
|
||||
datetime-settings = Datum, Uhrzeit und Kalendereinstellungen ...
|
||||
|
|
|
|||
1
cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl
Normal file
1
cosmic-applet-time/i18n/gl/cosmic_applet_time.ftl
Normal file
|
|
@ -0,0 +1 @@
|
|||
datetime-settings = Axustes de data, hora e calendario...
|
||||
0
cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl
Normal file
0
cosmic-applet-time/i18n/sat/cosmic_applet_time.ftl
Normal file
|
|
@ -521,35 +521,40 @@ impl cosmic::Application for Window {
|
|||
if let Some(p) = self.popup.take() {
|
||||
destroy_popup(p)
|
||||
} else {
|
||||
self.date_today = self.now.date();
|
||||
self.date_selected = self.date_today;
|
||||
return cosmic::surface::surface_task(cosmic::surface::action::app_popup(
|
||||
|_| Default::default(),
|
||||
|app: &mut Self| {
|
||||
app.date_today = app.now.date();
|
||||
app.date_selected = app.date_today;
|
||||
|
||||
let new_id = window::Id::unique();
|
||||
self.popup = Some(new_id);
|
||||
let new_id = window::Id::unique();
|
||||
app.popup = Some(new_id);
|
||||
|
||||
let mut popup_settings = self.core.applet.get_popup_settings(
|
||||
self.core.main_window_id().unwrap(),
|
||||
new_id,
|
||||
let mut popup_settings = app.core.applet.get_popup_settings(
|
||||
app.core.main_window_id().unwrap(),
|
||||
new_id,
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
let Rectangle {
|
||||
x,
|
||||
y,
|
||||
width,
|
||||
height,
|
||||
} = app.rectangle;
|
||||
popup_settings.positioner.anchor_rect = Rectangle::<i32> {
|
||||
x: x.max(1.) as i32,
|
||||
y: y.max(1.) as i32,
|
||||
width: width.max(1.) as i32,
|
||||
height: height.max(1.) as i32,
|
||||
};
|
||||
|
||||
popup_settings.positioner.size = None;
|
||||
popup_settings
|
||||
},
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
);
|
||||
let Rectangle {
|
||||
x,
|
||||
y,
|
||||
width,
|
||||
height,
|
||||
} = self.rectangle;
|
||||
popup_settings.positioner.anchor_rect = Rectangle::<i32> {
|
||||
x: x.max(1.) as i32,
|
||||
y: y.max(1.) as i32,
|
||||
width: width.max(1.) as i32,
|
||||
height: height.max(1.) as i32,
|
||||
};
|
||||
|
||||
popup_settings.positioner.size = None;
|
||||
|
||||
get_popup(popup_settings)
|
||||
));
|
||||
}
|
||||
}
|
||||
Message::Tick => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue