Fix missing scroll button property

This commit is contained in:
Peter Hutterer 2015-06-01 11:49:10 +10:00
parent 78fd1ccf62
commit c799754845
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From d4e0b5420ff2af2e790f12d10996f93ec6066b4a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 1 Jun 2015 11:41:09 +1000
Subject: [PATCH xf86-input-libinput] Fix missing scroll methods default/scroll
button property
Even if no scroll method is enabled by default, we still want those
properties.
Introduced in 8d4e03570c.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
src/libinput.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/libinput.c b/src/libinput.c
index 3cc4426..595b177 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -2242,9 +2242,6 @@ LibinputInitScrollMethodsProperty(DeviceIntPtr dev,
return;
scroll_methods = libinput_device_config_scroll_get_default_method(device);
- if (scroll_methods == LIBINPUT_CONFIG_SCROLL_NO_SCROLL)
- return;
-
if (scroll_methods & LIBINPUT_CONFIG_SCROLL_2FG)
methods[0] = TRUE;
if (scroll_methods & LIBINPUT_CONFIG_SCROLL_EDGE)
--
2.4.1

View File

@ -5,7 +5,7 @@
Summary: Xorg X11 libinput input driver
Name: xorg-x11-drv-libinput
Version: 0.10.0
Release: 4%{?dist}
Release: 5%{?dist}
URL: http://www.x.org
License: MIT
@ -15,6 +15,7 @@ Source1: 90-libinput.conf
Patch01: 0001-Only-init-abs-axes-if-we-don-t-have-acceleration.patch
# Bug 1208992 - Mouse cursor doesn't move when moving the physical mouse slowly
Patch02: 0001-Use-the-new-unaccelerated-valuator-ValuatorMask-feat.patch
Patch03: 0001-Fix-missing-scroll-methods-default-scroll-button-pro.patch
ExcludeArch: s390 s390x
@ -39,6 +40,7 @@ supporting all devices.
%setup -q -n %{tarball}-%{version}
%patch01 -p1
%patch02 -p1
%patch03 -p1
%build
autoreconf --force -v --install || exit 1
@ -74,6 +76,9 @@ Xorg X11 libinput input driver development files.
%{_includedir}/xorg/libinput-properties.h
%changelog
* Mon Jun 01 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.10.0-5
- Fix missing scroll button property
* Fri May 29 2015 Nils Philippsen <nils@redhat.com> 0.10.0-4
- fix URL