Skip to content

Commit

Permalink
Merge branch 'master' into lenemter/cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Feb 13, 2024
2 parents 51c20bf + 0b833ea commit fae28d6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
19 changes: 18 additions & 1 deletion compositor/WindowManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ namespace GreeterCompositor {

public Greeter.SystemBackground system_background { get; private set; }

Meta.PluginInfo info;
private Clutter.Actor fade_in_screen;

private Meta.PluginInfo info;

// Used to toggle screenreader
private GLib.Settings application_settings;
Expand Down Expand Up @@ -76,6 +78,12 @@ namespace GreeterCompositor {
public override void start () {
show_stage ();

fade_in_screen.save_easing_state ();
fade_in_screen.set_easing_duration (1000);
fade_in_screen.set_easing_mode (Clutter.AnimationMode.EASE);
fade_in_screen.opacity = 0;
fade_in_screen.restore_easing_state ();

unowned Meta.Display display = get_display ();
display.gl_video_memory_purged.connect (() => {
refresh_background ();
Expand Down Expand Up @@ -124,6 +132,15 @@ namespace GreeterCompositor {
pointer_locator = new PointerLocator (this);
ui_group.add_child (pointer_locator);

int width, height;
display.get_size (out width, out height);
fade_in_screen = new Clutter.Actor () {
width = width,
height = height,
background_color = Clutter.Color.from_rgba (0, 0, 0, 255),
};
stage.add_child (fade_in_screen);

MaskCorners.init (this);

/*keybindings*/
Expand Down
6 changes: 3 additions & 3 deletions po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: pantheon-greeter\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-06-19 17:04+0000\n"
"PO-Revision-Date: 2023-03-07 13:25+0000\n"
"PO-Revision-Date: 2024-02-12 08:12+0000\n"
"Last-Translator: Ryo Nakano <[email protected]>\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/desktop/greeter/"
"ja/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.14.2\n"
"X-Generator: Weblate 5.0.2\n"
"X-Launchpad-Export-Date: 2017-03-09 05:44+0000\n"

#: compositor/WindowManager.vala:324
Expand All @@ -28,7 +28,7 @@ msgstr[0] "変更は%i秒後に自動的に元に戻ります。"

#: compositor/WindowManager.vala:331
msgid "Keep new display settings?"
msgstr "新しいディスプレイの設定を維持しますか"
msgstr "新しいディスプレイの設定を維持しますか?"

#: compositor/WindowManager.vala:335
msgid "Keep Settings"
Expand Down
4 changes: 2 additions & 2 deletions src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ public int main (string[] args) {
var settings_daemon = new Greeter.SettingsDaemon ();
settings_daemon.start ();

Gtk.init (ref args);

Greeter.SubprocessSupervisor compositor;
Greeter.SubprocessSupervisor wingpanel;

Expand All @@ -43,6 +41,8 @@ public int main (string[] args) {
critical (e.message);
}

Gtk.init (ref args);

var window = new Greeter.MainWindow ();
window.show_all ();

Expand Down

0 comments on commit fae28d6

Please sign in to comment.