Accepting request 929557 from GNOME:Next
New stable release OBS-URL: https://build.opensuse.org/request/show/929557 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=393
This commit is contained in:
parent
ad9ee19bfd
commit
5608c64f5a
@ -1,45 +0,0 @@
|
||||
From 3b6f9111c7da3fee82d3ffd19c444155f84d86ea Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Tue, 19 Oct 2021 16:53:13 +0200
|
||||
Subject: [PATCH] clutter: Only reset preedit text if set
|
||||
|
||||
On ClutterInputFocus::reset, avoid to unset the preedit text if
|
||||
none was set earlier. This seems to trick GTK clients into focusing
|
||||
the cursor position again, even when we are moving away from it.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4647
|
||||
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2059>
|
||||
---
|
||||
clutter/clutter/clutter-input-focus.c | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/clutter/clutter/clutter-input-focus.c b/clutter/clutter/clutter-input-focus.c
|
||||
index c22e3a32c0..117bab72ce 100644
|
||||
--- a/clutter/clutter/clutter-input-focus.c
|
||||
+++ b/clutter/clutter/clutter-input-focus.c
|
||||
@@ -103,14 +103,16 @@ clutter_input_focus_reset (ClutterInputFocus *focus)
|
||||
|
||||
priv = clutter_input_focus_get_instance_private (focus);
|
||||
|
||||
- if (priv->preedit &&
|
||||
- priv->mode == CLUTTER_PREEDIT_RESET_COMMIT)
|
||||
- clutter_input_focus_commit (focus, priv->preedit);
|
||||
+ if (priv->preedit)
|
||||
+ {
|
||||
+ if (priv->mode == CLUTTER_PREEDIT_RESET_COMMIT)
|
||||
+ clutter_input_focus_commit (focus, priv->preedit);
|
||||
|
||||
- clutter_input_focus_set_preedit_text (focus, NULL, 0);
|
||||
- g_clear_pointer (&priv->preedit, g_free);
|
||||
- priv->mode = CLUTTER_PREEDIT_RESET_CLEAR;
|
||||
+ clutter_input_focus_set_preedit_text (focus, NULL, 0);
|
||||
+ g_clear_pointer (&priv->preedit, g_free);
|
||||
+ }
|
||||
|
||||
+ priv->mode = CLUTTER_PREEDIT_RESET_CLEAR;
|
||||
clutter_input_method_reset (priv->im);
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fa80a1a744044d88ebfd677ff03203d67705ed2cd624ea06cbb8b58948cdf89e
|
||||
size 2710476
|
3
mutter-41.1.tar.xz
Normal file
3
mutter-41.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:58e63fd0bc43f35134f21313aff4aebf92c829d6df4dc99a044a1e376691e3f3
|
||||
size 2712924
|
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 5 07:18:06 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 41.1:
|
||||
+ Fix monitor screencast scanouts
|
||||
+ dma-buf: Use alpha-less pixel formats where appropriate
|
||||
+ wayland: Allow clients to maximize windows regardless of
|
||||
constraints
|
||||
+ Handle hotplug events without relevant changes more effectively
|
||||
+ Improve error reporting when startup fails
|
||||
+ dma-buf: Add support for ABGR and XBGR formats
|
||||
+ Fix X11 middle button emulation setting
|
||||
+ Include server-side shadows in window screenshots
|
||||
+ Don't change workspaces of unmanaged windows
|
||||
+ Reset idletime when unplugging the power cable
|
||||
+ xwayland: Avoid unnecessary _NET_WM_STATE events
|
||||
+ Fix videos in Firefox stuttering in overview
|
||||
+ Don't use atomic mode setting for virtio_gpu driver
|
||||
+ Improve on-screen keyboard on X11
|
||||
+ Fix text glitches after size changes
|
||||
+ Fix reporting output rotation to xwayland
|
||||
+ wayland: Accept final preference of drop destination
|
||||
+ Fix erratic scrolling in GTK apps
|
||||
+ Fix tilt direction of pen/tablet inputs
|
||||
+ Use b/w unicode for tablet mode OSD
|
||||
+ Fix negative paint volume offscreen effect
|
||||
+ Only add paint volumes of mapped actors to stage clip
|
||||
+ Fix mapping tablet input to correct monitor
|
||||
+ Misc. bug fixes and cleanups.
|
||||
+ Updated translations.
|
||||
- Drop clutter-only_reset_preedit_text_if_set.patch: Fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 2 11:55:37 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
@ -23,15 +23,13 @@
|
||||
%define api_minor 0
|
||||
%define libmutter libmutter-%{api_major}-%{api_minor}
|
||||
Name: mutter
|
||||
Version: 41.0
|
||||
Version: 41.1
|
||||
Release: 0
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/GUI/GNOME
|
||||
URL: https://www.gnome.org
|
||||
Source: https://download.gnome.org/sources/mutter/41/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM clutter-only_reset_preedit_text_if_set.patch glgo#GNOME/mutter!2059 -- Upstream bugfix that will be part of GNOME 42: Only reset preedit text if set
|
||||
Patch1: clutter-only_reset_preedit_text_if_set.patch
|
||||
# PATCH-FIX-OPENSUSE mutter-Lower-HIDPI_LIMIT-to-144.patch fate#326682, bsc#1125467 qkzhu@suse.com -- Lower HIDPI_LIMIT to 144
|
||||
Patch3: mutter-Lower-HIDPI_LIMIT-to-144.patch
|
||||
# PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there
|
||||
@ -122,7 +120,7 @@ Obsoletes: typelib-1_0-Meta-3_0
|
||||
Obsoletes: libmutter-8-0 <= %{version}
|
||||
# mutter-data was essentilly hard-required at the same version, as mutter requires
|
||||
# libmutter-<n>-0 (which has a soname bump at every major version change), libmutter
|
||||
# required mutter-data >= %{version} and mutter-data required mutter=%{version}.
|
||||
# required mutter-data >= %%{version} and mutter-data required mutter=%%{version}.
|
||||
Obsoletes: mutter-data <= %{version}
|
||||
|
||||
%description
|
||||
@ -142,7 +140,6 @@ applications that want to make use of the mutter library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user