Skip to content

Commit 041b4e1

Browse files
authored
Merge branch 'main' into leolost/dnd-action-fix-touch-select
2 parents 315bcdb + cb6f645 commit 041b4e1

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

data/gala.metainfo.xml.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="8.0.2" date="2024-10-15" urgency="medium">
30+
<release version="8.0.2" date="2024-10-24" urgency="medium">
3131
<description>
3232
<p>Improvements:</p>
3333
<ul>
3434
<li>Updated translations</li>
3535
</ul>
3636
</description>
3737
<issues>
38+
<issue url="https://github.com/elementary/gala/issues/1737">Cursor only visible in window screenshots </issue>
3839
<issue url="https://github.com/elementary/gala/issues/1898">wayland: opening windows when overview is opened breaks a lot</issue>
3940
<issue url="https://github.com/elementary/gala/issues/2053">Window renders black</issue>
4041
<issue url="https://github.com/elementary/gala/issues/2067">Terminal and System Settings have generic icon in multitasking view on Wayland</issue>

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('gala',
22
'c', 'vala',
3-
version: '8.0.1',
3+
version: '8.0.2',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)

po/pt_BR.po

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-10-15 19:33+0000\n"
11-
"PO-Revision-Date: 2024-09-02 00:57+0000\n"
12-
"Last-Translator: José Rafael <jrafaeldesantana@gmail.com>\n"
11+
"PO-Revision-Date: 2024-10-26 22:46+0000\n"
12+
"Last-Translator: Diogo Pessoa <diogopessoabr@gmail.com>\n"
1313
"Language-Team: Portuguese (Brazil) <https://l10n.elementary.io/projects/"
1414
"desktop/gala/pt_BR/>\n"
1515
"Language: pt_BR\n"
@@ -121,16 +121,12 @@ msgid "Updated translations"
121121
msgstr "Traduções atualizadas"
122122

123123
#: data/gala.metainfo.xml.in:49
124-
#, fuzzy
125-
#| msgid "Fix potential crash when taking screenshots"
126124
msgid "Fix a potential crash when moving windows between workspaces"
127-
msgstr "Corrigir possíveis falhas ao capturar telas"
125+
msgstr "Corrige uma potencial falha ao mover janelas entre espaços de trabalho"
128126

129127
#: data/gala.metainfo.xml.in:50
130-
#, fuzzy
131-
#| msgid "Fix notification position after changing DPI"
132128
msgid "Fix notification animation when entering multitasking view"
133-
msgstr "Corrigir a posição das notificações depois de modificar o DPI"
129+
msgstr "Corrige animação de notificação ao entrar na visão multitarefa"
134130

135131
#: data/gala.metainfo.xml.in:65
136132
msgid "Improve keyboard navigation in Multitasking View"

src/ScreenshotManager.vala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,7 @@ namespace Gala {
394394

395395
image = new Cairo.ImageSurface (Cairo.Format.ARGB32, image_width, image_height);
396396

397-
var paint_flags = Clutter.PaintFlag.NO_CURSORS;
398-
if (include_cursor) {
399-
paint_flags |= Clutter.PaintFlag.FORCE_CURSORS;
400-
}
397+
var paint_flags = include_cursor ? Clutter.PaintFlag.FORCE_CURSORS : Clutter.PaintFlag.NO_CURSORS;
401398

402399
try {
403400
if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) {

src/ShellClients/PanelClone.vala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ public class Gala.PanelClone : Object {
6363
}
6464
});
6565

66+
// Make sure the actor is visible once it's focused FIXME: better event not only focused
67+
// https://github.com/elementary/gala/issues/2080
68+
panel.window.focused.connect (update_visible);
69+
6670
update_visible ();
6771
update_clone_position ();
6872

@@ -77,6 +81,12 @@ public class Gala.PanelClone : Object {
7781

7882
private void update_visible () {
7983
actor.visible = !panel_hidden;
84+
85+
if (actor.visible && !wm.get_display ().get_monitor_in_fullscreen (panel.window.get_monitor ())) {
86+
// The actor has just been revealed, make sure it's at the top
87+
// https://github.com/elementary/gala/issues/2080
88+
actor.get_parent ().set_child_above_sibling (actor, null);
89+
}
8090
}
8191

8292
private void update_clone_position () {

0 commit comments

Comments
 (0)