elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-05 19:27:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'Minimize' to 'Hide' (#953)

Browse Source
This commit is contained in:
Julian Raschke 2020-11-03 21:34:59 +01:00 committed by GitHub
parent a151876fa6
commit f1be427cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon/MenuDaemon.vala
View File

@ -32,14 +32,14 @@ namespace Gala {
// Window Menu
private Granite.AccelLabel always_on_top_accellabel;
private Granite.AccelLabel close_accellabel;
private Granite.AccelLabel minimize_accellabel;
private Granite.AccelLabel hide_accellabel;
private Granite.AccelLabel move_accellabel;
private Granite.AccelLabel move_left_accellabel;
private Granite.AccelLabel move_right_accellabel;
private Granite.AccelLabel on_visible_workspace_accellabel;
private Granite.AccelLabel resize_accellabel;
Gtk.Menu? window_menu = null;
Gtk.MenuItem minimize;
Gtk.MenuItem hide;
Gtk.MenuItem maximize;
Gtk.MenuItem move;
Gtk.MenuItem resize;
@ -108,12 +108,12 @@ namespace Gala {
}
private void init_window_menu () {
minimize_accellabel = new Granite.AccelLabel (_("Minimize"));
hide_accellabel = new Granite.AccelLabel (_("Hide"));
minimize = new Gtk.MenuItem ();
minimize.add (minimize_accellabel);
minimize.activate.connect (() => {
perform_action (Gala.ActionType.MINIMIZE_CURRENT);
hide = new Gtk.MenuItem ();
hide.add (hide_accellabel);
hide.activate.connect (() => {
perform_action (Gala.ActionType.HIDE_CURRENT);
});
maximize = new Gtk.MenuItem ();
@ -178,7 +178,7 @@ namespace Gala {
});
window_menu = new Gtk.Menu ();
window_menu.append (minimize);
window_menu.append (hide);
window_menu.append (maximize);
window_menu.append (move);
window_menu.append (resize);
@ -195,9 +195,9 @@ namespace Gala {
init_window_menu ();
}
minimize.visible = Gala.WindowFlags.CAN_MINIMIZE in flags;
if (minimize.visible) {
minimize_accellabel.accel_string = keybind_settings.get_strv ("minimize")[0];
hide.visible = Gala.WindowFlags.CAN_HIDE in flags;
if (hide.visible) {
hide_accellabel.accel_string = keybind_settings.get_strv ("minimize")[0];
}
maximize.visible = Gala.WindowFlags.CAN_MAXIMIZE in flags;

4
lib/Constants.vala
View File

@ -22,8 +22,8 @@ namespace Gala {
OPEN = 350,
// Duration of the close animation
CLOSE = 195,
// Duration of the minimize animation
MINIMIZE = 200,
// Duration of the hide animation
HIDE = 200,
// Duration of the menu mapping animation
MENU_MAP = 150,
// Duration of the snap animation as used by maximize/unmaximize

4
lib/WindowManager.vala
View File

@ -20,7 +20,7 @@ namespace Gala {
NONE = 0,
SHOW_WORKSPACE_VIEW,
MAXIMIZE_CURRENT,
MINIMIZE_CURRENT,
HIDE_CURRENT,
OPEN_LAUNCHER,
CUSTOM_COMMAND,
WINDOW_OVERVIEW,
@ -38,7 +38,7 @@ namespace Gala {
[Flags]
public enum WindowFlags {
NONE = 0,
CAN_MINIMIZE,
CAN_HIDE,
CAN_MAXIMIZE,
IS_MAXIMIZED,
ALLOWS_MOVE,

10
src/WindowManager.vala
View File

@ -886,7 +886,7 @@ namespace Gala {
else
current.maximize (Meta.MaximizeFlags.HORIZONTAL | Meta.MaximizeFlags.VERTICAL);
break;
case ActionType.MINIMIZE_CURRENT:
case ActionType.HIDE_CURRENT:
if (current != null && current.window_type == Meta.WindowType.NORMAL)
current.minimize ();
break;
@ -1016,7 +1016,7 @@ namespace Gala {
WindowFlags flags = WindowFlags.NONE;
if (window.can_minimize ())
flags |= WindowFlags.CAN_MINIMIZE;
flags |= WindowFlags.CAN_HIDE;
if (window.can_maximize ())
flags |= WindowFlags.CAN_MAXIMIZE;
@ -1222,7 +1222,7 @@ namespace Gala {
}
public override void minimize (Meta.WindowActor actor) {
const int duration = AnimationDuration.MINIMIZE;
const int duration = AnimationDuration.HIDE;
if (!enable_animations
|| duration == 0
@ -1403,7 +1403,7 @@ namespace Gala {
switch (window.window_type) {
case Meta.WindowType.NORMAL:
var duration = AnimationDuration.MINIMIZE;
var duration = AnimationDuration.HIDE;
if (duration == 0) {
unminimize_completed (actor);
return;
@ -1457,7 +1457,7 @@ namespace Gala {
switch (window.window_type) {
case Meta.WindowType.NORMAL:
var duration = AnimationDuration.MINIMIZE;
var duration = AnimationDuration.HIDE;
if (duration == 0) {
map_completed (actor);
return;