diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-01-26 20:45:38 -0500 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-01-26 20:45:38 -0500 |
| commit | f5357b1ca4ae90e7ad6d8321884319cfdf828508 (patch) | |
| tree | 5706d28900dd4f7441bae1629242a2ca029d645b /src/xterm.c | |
| parent | c9a268552c8294bbca607da239528e6b89f8fb5b (diff) | |
| parent | 463f96b4813fb77d88a7b0fa93f94aa08d71689f (diff) | |
| download | emacs-f5357b1ca4ae90e7ad6d8321884319cfdf828508.tar.gz emacs-f5357b1ca4ae90e7ad6d8321884319cfdf828508.tar.bz2 emacs-f5357b1ca4ae90e7ad6d8321884319cfdf828508.zip | |
Merge from emacs-26
463f96b481 * doc/lispref/searching.texi: Document regexp repetition l...
08a6195571 ; test/README: Document TEST_LOAD_EL parameter.
7bbea90b1a * src/syntax.c (char-syntax): Warn about ignoring text pro...
50fcbb5f61 ; * src/process.c (Fprocess_contact): Fix docstring typo.
81ae9c8c05 Load mm-util as needed for url-file and url-data (Bug#30258)
5a1ee67ae1 Another minor copyedit in the manual's "Scroll Bars"
226a651e9e Minor fix in documentation of 'equal'
b26786c8d9 * lisp/dired-x.el (dired-guess-shell-alist-user): Doc fix....
5699a824f0 Minor rewording in Emacs manual's "Help Mode" node
f35ff0156e Fixes for Emacs manual in frames.texi
6cd4e8dcc5 * doc/misc/cl.texi (Efficiency Concerns): Fix 2012-10-27 t...
1412cf3edd Fix a few issues with latest GTK scaling changes
59db8dca03 Use scaled coordinates when calling into GTK
2892f05792 Scale monitor dimensions obtained from GTK
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index 0a2068d7f30..7603e4f3991 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10301,6 +10301,9 @@ void x_set_offset (struct frame *f, register int xoff, register int yoff, int change_gravity) { int modified_top, modified_left; +#ifdef USE_GTK + int scale = xg_get_scale (f); +#endif if (change_gravity > 0) { @@ -10323,11 +10326,12 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_ if (x_gtk_use_window_move) { /* When a position change was requested and the outer GTK widget - has been realized already, leave it to gtk_window_move to DTRT - and return. Used for Bug#25851 and Bug#25943. */ + has been realized already, leave it to gtk_window_move to + DTRT and return. Used for Bug#25851 and Bug#25943. Convert + from X pixels to GTK scaled pixels. */ if (change_gravity != 0 && FRAME_GTK_OUTER_WIDGET (f)) gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), - f->left_pos, f->top_pos); + f->left_pos / scale, f->top_pos / scale); unblock_input (); return; } @@ -10346,8 +10350,9 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, int change_ } #ifdef USE_GTK + /* Make sure we adjust for possible scaling. */ gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), - modified_left, modified_top); + modified_left / scale, modified_top / scale); #else XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), modified_left, modified_top); |