Mercurial > vim
annotate src/gui_xmebwp.h @ 34680:2fd4ce2a5058 v9.1.0221
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Commit: https://github.com/vim/vim/commit/b6fac4db3647179671d3267a4bcd418e92cd4572
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:40:41 2024 +0100
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Problem: The if branch to set `text_prop_follows` was both checking if
it was at the end of the buffer text line or if it was at the
end of the screen line, but the former being true skipped
a guard condition in the latter to only consider 'below'
virtual text to follow. `text_prop_follows` being improperly
set caused it to skip a conditional block to break at the end
as well as one to move `ptr` to the end of the text line,
while repeated for each following line of the window.
Solution: Move the check for whether 'below' virtual text should follow
so it is also used when at the end of the buffer text line.
(Dylan Thacker-Smith)
fixes: #12213
related: #14307
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Mar 2024 12:00:03 +0100 |
| parents | 6e3dc2d630c2 |
| children |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
4352
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 50 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 /* | |
| 10 * | |
| 11 * (C) 2002,2005 by Marcin Dalecki <martin@dalecki.de> | |
| 12 * | |
| 13 * MARCIN DALECKI ASSUMES NO RESPONSIBILITY FOR THE USE OR INABILITY TO USE ANY | |
| 14 * OF THIS SOFTWARE . THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY | |
| 15 * KIND, AND MARCIN DALECKI EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES, | |
| 16 * INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | |
| 17 * FITNESS FOR A PARTICULAR PURPOSE. | |
| 18 */ | |
| 19 | |
| 20 #ifndef EnhancedBP_H | |
| 21 #define EnhancedBP_H | |
| 22 | |
| 23 #include <Xm/PushBP.h> | |
| 24 | |
| 25 #include "gui_xmebw.h" | |
| 26 | |
| 27 | |
| 28 /* | |
| 4352 | 29 * EnhancedButton class structure. |
| 50 | 30 */ |
| 31 typedef struct _XmEnhancedButtonClassPart | |
| 32 { | |
| 33 Pixmap stipple_bitmap; | |
| 34 } XmEnhancedButtonClassPart; | |
| 35 | |
| 36 /* | |
| 37 * Full class record declaration for EnhancedButton class. | |
| 38 */ | |
| 39 typedef struct | |
| 40 { | |
| 41 CoreClassPart core_class; | |
| 42 XmPrimitiveClassPart primitive_class; | |
| 43 XmLabelClassPart label_class; | |
| 44 XmPushButtonClassPart pushbutton_class; | |
| 45 XmEnhancedButtonClassPart enhancedbutton_class; | |
| 46 } XmEnhancedButtonClassRec; | |
| 47 | |
| 48 | |
| 49 extern XmEnhancedButtonClassRec xmEnhancedButtonClassRec; | |
| 50 | |
| 51 /* | |
| 4352 | 52 * EnhancedButton instance record. |
| 50 | 53 */ |
| 54 typedef struct _XmEnhancedButtonPart | |
| 55 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
56 // public resources |
| 50 | 57 String pixmap_data; |
| 58 String pixmap_file; | |
| 59 Dimension spacing; | |
| 60 int label_location; | |
| 61 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
10042
diff
changeset
|
62 // private resources |
| 50 | 63 int pixmap_depth; |
| 64 Dimension pixmap_width; | |
| 65 Dimension pixmap_height; | |
| 66 Pixmap normal_pixmap; | |
| 67 Pixmap armed_pixmap; | |
| 68 Pixmap insensitive_pixmap; | |
| 69 Pixmap highlight_pixmap; | |
| 70 | |
| 71 int doing_setvalues; | |
| 72 int doing_destroy; | |
| 73 } XmEnhancedButtonPart; | |
| 74 | |
| 75 | |
| 76 /* | |
| 77 * Full instance record declaration. | |
| 78 */ | |
| 79 typedef struct _XmEnhancedButtonRec | |
| 80 { | |
| 81 CorePart core; | |
| 82 XmPrimitivePart primitive; | |
| 83 XmLabelPart label; | |
| 84 XmPushButtonPart pushbutton; | |
| 85 XmEnhancedButtonPart enhancedbutton; | |
| 86 } XmEnhancedButtonRec; | |
| 87 | |
| 88 #endif |