upgrade to 0.11.0 for xfce 4.16

This commit is contained in:
linz 2021-06-24 12:46:10 +08:00
parent 745ea66674
commit b65a17d0f0
4 changed files with 9 additions and 93 deletions

View File

@ -1,86 +0,0 @@
From ff0c3ec9f71ad27b635637774d0b065d6e49b8ef Mon Sep 17 00:00:00 2001
From: Sean Davis <smd.seandavis@gmail.com>
Date: Sun, 1 Mar 2020 07:13:52 -0500
Subject: Enable keyboard scrolling in Details pane (bug #15912)
---
panel-plugin/weather-summary.c | 53 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index da12a5b..e66abf0 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -282,6 +282,56 @@ weather_summary_get_logo(plugin_data *data)
}
+static gboolean
+text_view_key_pressed_cb (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW (user_data);
+ GtkAdjustment *adjustment = gtk_scrolled_window_get_vadjustment (scrolled);
+ gdouble current = gtk_adjustment_get_value (adjustment);
+ gdouble min = gtk_adjustment_get_lower (adjustment);
+ gdouble max = gtk_adjustment_get_upper (adjustment);
+ gdouble step_size = 0;
+
+ switch (event->keyval) {
+ case GDK_KEY_Up:
+ case GDK_KEY_uparrow:
+ step_size = -1 * gtk_adjustment_get_step_increment (adjustment);
+ break;
+ case GDK_KEY_Down:
+ case GDK_KEY_downarrow:
+ step_size = gtk_adjustment_get_step_increment (adjustment);
+ break;
+ case GDK_KEY_Page_Up:
+ step_size = -1 * gtk_adjustment_get_page_size (adjustment);
+ break;
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_space:
+ step_size = gtk_adjustment_get_page_size (adjustment);
+ break;
+ case GDK_KEY_Home:
+ step_size = -1 * current;
+ break;
+ case GDK_KEY_End:
+ step_size = max;
+ break;
+ }
+
+ if (step_size != 0) {
+ current = current + step_size;
+ if (current < min) current = min;
+ if (current > max) current = max;
+
+ gtk_adjustment_set_value (adjustment, current);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+
static GtkWidget *
create_summary_tab(plugin_data *data)
{
@@ -311,9 +361,12 @@ create_summary_tab(plugin_data *data)
gtk_text_view_set_top_margin (GTK_TEXT_VIEW(view), 12);
gtk_text_view_set_right_margin (GTK_TEXT_VIEW(view), 12);
gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW(view), 12);
+
frame = gtk_frame_new(NULL);
scrolled = gtk_scrolled_window_new(NULL, NULL);
+ g_signal_connect(GTK_WIDGET(view), "key-press-event", G_CALLBACK(text_view_key_pressed_cb), scrolled);
+
overlay = gtk_overlay_new ();
gtk_container_add (GTK_CONTAINER (overlay), view);
--
cgit v1.2.3

Binary file not shown.

Binary file not shown.

View File

@ -1,16 +1,15 @@
%global xfceversion 4.14 %global minorversion 0.11
%global xfceversion 4.16
Name: xfce4-weather-plugin Name: xfce4-weather-plugin
Version: 0.10.1 Version: 0.11.0
Release: 1 Release: 1
Summary: Weather information plugin for the Xfce panel Summary: Weather information plugin for the Xfce panel
License: BSD License: BSD
#Group: Development/Libraries
URL: http://goodies.xfce.org/projects/panel-plugins/%{name} URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/0.10/%{name}-%{version}.tar.bz2 Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
Patch0: enable_scrolling_in_details_pane.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildArch: noarch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion}
@ -32,7 +31,7 @@ Features include:
- Humidity, Visibility, Dew-point, UV Index. - Humidity, Visibility, Dew-point, UV Index.
%prep %prep
%autosetup -p1 %autosetup
%build %build
%configure %configure
@ -58,5 +57,8 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
%{_datadir}/xfce4/weather %{_datadir}/xfce4/weather
%changelog %changelog
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 0.11.0-1
- Update to 0.11.0
* Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 0.10.1-1 * Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 0.10.1-1
- Init package - Init package