|
 |
0c2b1b |
From 89a5825eb20bfa91b91055e5a3dfe6445e6b9bd2 Mon Sep 17 00:00:00 2001
|
|
|
0c2b1b |
From: raveit65 <mate@raveit.de>
|
|
|
0c2b1b |
Date: Fri, 11 Jun 2021 21:26:40 +0200
|
|
|
0c2b1b |
Subject: [PATCH] Revert "pager: do not change workspace size from
|
|
|
0c2b1b |
size_allocate"
|
|
|
0c2b1b |
|
|
|
0c2b1b |
This reverts commit 3456b747b6381f17d48629dd8fdd4d511e739b10.
|
|
|
0c2b1b |
---
|
|
|
0c2b1b |
libwnck/pager.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
0c2b1b |
1 file changed, 59 insertions(+)
|
|
|
0c2b1b |
|
|
|
0c2b1b |
diff --git a/libwnck/pager.c b/libwnck/pager.c
|
|
|
0c2b1b |
index c769d62..a563a4d 100644
|
|
|
0c2b1b |
--- a/libwnck/pager.c
|
|
|
0c2b1b |
+++ b/libwnck/pager.c
|
|
|
0c2b1b |
@@ -122,6 +122,8 @@ static void wnck_pager_get_preferred_height_for_width (GtkWidget *widget,
|
|
|
0c2b1b |
int width,
|
|
|
0c2b1b |
int *minimum_height,
|
|
|
0c2b1b |
int *natural_height);
|
|
|
0c2b1b |
+static void wnck_pager_size_allocate (GtkWidget *widget,
|
|
|
0c2b1b |
+ GtkAllocation *allocation);
|
|
|
0c2b1b |
static gboolean wnck_pager_draw (GtkWidget *widget,
|
|
|
0c2b1b |
cairo_t *cr);
|
|
|
0c2b1b |
static gboolean wnck_pager_button_press (GtkWidget *widget,
|
|
|
0c2b1b |
@@ -247,6 +249,7 @@ wnck_pager_class_init (WnckPagerClass *klass)
|
|
|
0c2b1b |
widget_class->get_preferred_width_for_height = wnck_pager_get_preferred_width_for_height;
|
|
|
0c2b1b |
widget_class->get_preferred_height = wnck_pager_get_preferred_height;
|
|
|
0c2b1b |
widget_class->get_preferred_height_for_width = wnck_pager_get_preferred_height_for_width;
|
|
|
0c2b1b |
+ widget_class->size_allocate = wnck_pager_size_allocate;
|
|
|
0c2b1b |
widget_class->draw = wnck_pager_draw;
|
|
|
0c2b1b |
widget_class->button_press_event = wnck_pager_button_press;
|
|
|
0c2b1b |
widget_class->button_release_event = wnck_pager_button_release;
|
|
|
0c2b1b |
@@ -684,6 +687,62 @@ wnck_pager_get_preferred_height_for_width (GtkWidget *widget,
|
|
|
0c2b1b |
*natural_height = *minimum_height = MAX (height, 0);
|
|
|
0c2b1b |
}
|
|
|
0c2b1b |
|
|
|
0c2b1b |
+static gboolean
|
|
|
0c2b1b |
+_wnck_pager_queue_resize (gpointer data)
|
|
|
0c2b1b |
+{
|
|
|
0c2b1b |
+ gtk_widget_queue_resize (GTK_WIDGET (data));
|
|
|
0c2b1b |
+ return FALSE;
|
|
|
0c2b1b |
+}
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+static void
|
|
|
0c2b1b |
+wnck_pager_size_allocate (GtkWidget *widget,
|
|
|
0c2b1b |
+ GtkAllocation *allocation)
|
|
|
0c2b1b |
+{
|
|
|
0c2b1b |
+ WnckPager *pager;
|
|
|
0c2b1b |
+ int workspace_size;
|
|
|
0c2b1b |
+ GtkBorder padding;
|
|
|
0c2b1b |
+ int width;
|
|
|
0c2b1b |
+ int height;
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ pager = WNCK_PAGER (widget);
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ width = allocation->width;
|
|
|
0c2b1b |
+ height = allocation->height;
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ _wnck_pager_get_padding (pager, &padding);
|
|
|
0c2b1b |
+ width -= padding.left + padding.right;
|
|
|
0c2b1b |
+ height -= padding.top + padding.bottom;
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ g_assert (pager->priv->n_rows > 0);
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ if (pager->priv->orientation == GTK_ORIENTATION_VERTICAL)
|
|
|
0c2b1b |
+ {
|
|
|
0c2b1b |
+ if (pager->priv->show_all_workspaces)
|
|
|
0c2b1b |
+ workspace_size = (width - (pager->priv->n_rows - 1)) / pager->priv->n_rows;
|
|
|
0c2b1b |
+ else
|
|
|
0c2b1b |
+ workspace_size = width;
|
|
|
0c2b1b |
+ }
|
|
|
0c2b1b |
+ else
|
|
|
0c2b1b |
+ {
|
|
|
0c2b1b |
+ if (pager->priv->show_all_workspaces)
|
|
|
0c2b1b |
+ workspace_size = (height - (pager->priv->n_rows - 1))/ pager->priv->n_rows;
|
|
|
0c2b1b |
+ else
|
|
|
0c2b1b |
+ workspace_size = height;
|
|
|
0c2b1b |
+ }
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ workspace_size = MAX (workspace_size, 1);
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ if (workspace_size != pager->priv->workspace_size)
|
|
|
0c2b1b |
+ {
|
|
|
0c2b1b |
+ pager->priv->workspace_size = workspace_size;
|
|
|
0c2b1b |
+ g_idle_add (_wnck_pager_queue_resize, pager);
|
|
|
0c2b1b |
+ return;
|
|
|
0c2b1b |
+ }
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
+ GTK_WIDGET_CLASS (wnck_pager_parent_class)->size_allocate (widget,
|
|
|
0c2b1b |
+ allocation);
|
|
|
0c2b1b |
+}
|
|
|
0c2b1b |
+
|
|
|
0c2b1b |
static void
|
|
|
0c2b1b |
get_workspace_rect (WnckPager *pager,
|
|
|
0c2b1b |
int space,
|
|
|
0c2b1b |
--
|
|
|
0c2b1b |
2.31.1
|
|
|
0c2b1b |
|