diff options
| author | Alan Third | 2016-05-01 13:04:07 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2016-05-01 13:04:07 +0200 |
| commit | e683a2570be6f2e4f8defa4e7ee35a7d87f18918 (patch) | |
| tree | 0b749572bb70a6222d333d932bda7a29b18e5729 /src/window.h | |
| parent | 80a1e3b9b58aaeb71913737e07bb305d9eb54437 (diff) | |
| download | emacs-e683a2570be6f2e4f8defa4e7ee35a7d87f18918.tar.gz emacs-e683a2570be6f2e4f8defa4e7ee35a7d87f18918.zip | |
Implement horizontal scroll bars on NS
* lisp/scroll-bar.el (horizontal-scroll-bars-available-p): Remove NS
check.
* lisp/term/ns-win.el: Remove custom NS scroll-bar handlers and bind
scroll-bar mouse clicks to standard handlers.
* src/nsterm.h (EmacsScroller): Add 'horizontal' property and rename
pixel_height to pixel_length.
* src/nsterm.m (x_set_window_size): Remove left-hand scroll-bar code. It
caused scroll-bars to be over-drawn and the best working solution
appears to be complete removal.
(ns_set_horizontal_scroll_bar): Rewrite to handle horizontal scrollers
correctly.
(ns_set_vertical_scroll_bar): Set width to actual scroller width.
(setFrame): Handle horizontal case.
(dealloc): Handle horizontal case.
(judge): Handle horizontal case.
(setPosition): Rename pixel_height to pixel_length.
(sendScrollEventAtLoc): Handle horizontal case.
(mouseDown): Handle horizontal case and general tidy up of code.
(mouseDragged): Handle horizontal case. Call sendScrollEventAtLoc with
absolute pixel size instead of ratio.
* src/window.h: Remove NS check.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.h b/src/window.h index 84180c96a7d..1fd19369c33 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -793,7 +793,7 @@ wset_next_buffers (struct window *w, Lisp_Object val) | |||
| 793 | || WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (W)) | 793 | || WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (W)) |
| 794 | 794 | ||
| 795 | #if (defined (HAVE_WINDOW_SYSTEM) \ | 795 | #if (defined (HAVE_WINDOW_SYSTEM) \ |
| 796 | && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS)) \ | 796 | && ((defined (USE_TOOLKIT_SCROLL_BARS)) \ |
| 797 | || defined (HAVE_NTGUI))) | 797 | || defined (HAVE_NTGUI))) |
| 798 | # define USE_HORIZONTAL_SCROLL_BARS true | 798 | # define USE_HORIZONTAL_SCROLL_BARS true |
| 799 | #else | 799 | #else |