diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:14:19 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-20 21:14:19 -0500 |
| commit | b5f140166ab9057b9e9dd56fd332e6b2937388c4 (patch) | |
| tree | aba8c8cc99db410ccec64d1fab7c55d2ed43b6f8 /src/gtkutil.c | |
| parent | 5bf3ab291c90b4976e70694982db55dad3fa84cd (diff) | |
| parent | 4122d54067c61bbdff5aab7ddf5dfe5b5797b218 (diff) | |
| download | emacs-b5f140166ab9057b9e9dd56fd332e6b2937388c4.tar.gz | |
Merge from origin/emacs-26
4122d54 Fix updating scrollbar sizes when scaling is in effect
21a212f Collect GnuTLS extensions and use them to set %DUMBFW if supp...
936136e * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste lefto...
07b7fb9 * lisp/subr.el (delayed-after-hook-functions): Rename from .....
a5b0a4e * lisp/net/shr.el (shr-string-pixel-width): Return pixel-widt...
c51e797 python.el doc fixes
c62ced5 Make 'mouse-drag-and-drop-region' more robust and customizable
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index c279f1d2bcd..ecb40285853 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3899,7 +3899,7 @@ xg_update_scrollbar_pos (struct frame *f, top /= scale; left /= scale; height /= scale; - left -= (scale - 1) * ((width / scale) >> 1); + width /= scale; /* Clear out old position. */ int oldx = -1, oldy = -1, oldw, oldh; @@ -3975,6 +3975,12 @@ xg_update_horizontal_scrollbar_pos (struct frame *f, GtkWidget *wfixed = f->output_data.x->edit_widget; GtkWidget *wparent = gtk_widget_get_parent (wscroll); gint msl; + int scale = xg_get_scale (f); + + top /= scale; + left /= scale; + height /= scale; + width /= scale; /* Clear out old position. */ int oldx = -1, oldy = -1, oldw, oldh; |