[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b373c8ad71: Fix tool bar size reporting on GTK when the display i
From: |
Po Lu |
Subject: |
master b373c8ad71: Fix tool bar size reporting on GTK when the display is scaled |
Date: |
Tue, 25 Jan 2022 01:43:38 -0500 (EST) |
branch: master
commit b373c8ad71eb3877294451af5eb75819c706785a
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Fix tool bar size reporting on GTK when the display is scaled
* src/gtkutil.c (xg_update_tool_bar_sizes): Multiply sizes to
turn them into device pixels.
---
src/gtkutil.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/gtkutil.c b/src/gtkutil.c
index eb14856062..607cf5ee2e 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -5471,6 +5471,7 @@ xg_update_tool_bar_sizes (struct frame *f)
GtkRequisition req;
int nl = 0, nr = 0, nt = 0, nb = 0;
GtkWidget *top_widget = x->toolbar_widget;
+ int scale = xg_get_scale (f);
gtk_widget_get_preferred_size (GTK_WIDGET (top_widget), NULL, &req);
if (x->toolbar_in_hbox)
@@ -5479,8 +5480,10 @@ xg_update_tool_bar_sizes (struct frame *f)
gtk_container_child_get (GTK_CONTAINER (x->hbox_widget),
top_widget,
"position", &pos, NULL);
- if (pos == 0) nl = req.width;
- else nr = req.width;
+ if (pos == 0)
+ nl = req.width * scale;
+ else
+ nr = req.width * scale;
}
else
{
@@ -5488,8 +5491,10 @@ xg_update_tool_bar_sizes (struct frame *f)
gtk_container_child_get (GTK_CONTAINER (x->vbox_widget),
top_widget,
"position", &pos, NULL);
- if (pos == 0 || (pos == 1 && x->menubar_widget)) nt = req.height;
- else nb = req.height;
+ if (pos == 0 || (pos == 1 && x->menubar_widget))
+ nt = req.height * scale;
+ else
+ nb = req.height * scale;
}
if (nl != FRAME_TOOLBAR_LEFT_WIDTH (f)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master b373c8ad71: Fix tool bar size reporting on GTK when the display is scaled,
Po Lu <=