Mercurial > vim
view src/beval.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 | 352701a626ed |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * Visual Workshop integration by Gordon Prieur * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ #if !defined(BEVAL__H) && (defined(FEAT_BEVAL) || defined(PROTO)) #define BEVAL__H #ifdef FEAT_GUI_GTK # ifdef USE_GTK3 # include <gtk/gtk.h> # else # include <gtk/gtkwidget.h> # endif #else # if defined(FEAT_GUI_X11) # include <X11/Intrinsic.h> # endif #endif typedef enum { ShS_NEUTRAL, // nothing showing or pending ShS_PENDING, // data requested from debugger ShS_UPDATE_PENDING, // switching information displayed ShS_SHOWING // the balloon is being displayed } BeState; typedef struct BalloonEvalStruct { #ifdef FEAT_BEVAL_GUI # ifdef FEAT_GUI_GTK GtkWidget *target; // widget we are monitoring GtkWidget *balloonShell; GtkWidget *balloonLabel; unsigned int timerID; // timer for run BeState showState; // tells us what's currently going on int x; int y; unsigned int state; // Button/Modifier key state # else # if !defined(FEAT_GUI_MSWIN) Widget target; // widget we are monitoring Widget balloonShell; Widget balloonLabel; XtIntervalId timerID; // timer for run BeState showState; // tells us what's currently going on XtAppContext appContext; // used in event handler Position x; Position y; Position x_root; Position y_root; int state; // Button/Modifier key state # else HWND target; HWND balloon; int x; int y; BeState showState; // tells us what's currently going on # endif # endif # if !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_MSWIN) Dimension screen_width; // screen width in pixels Dimension screen_height; // screen height in pixels # endif void (*msgCB)(struct BalloonEvalStruct *, int); void *clientData; // For callback #endif int ts; // tabstop setting for this buffer #ifdef FEAT_VARTABS int *vts; // vartabstop setting for this buffer #endif char_u *msg; // allocated: current text #ifdef FEAT_GUI_MSWIN void *tofree; #endif #ifdef FEAT_GUI_HAIKU int x; int y; #endif } BalloonEval; #define EVAL_OFFSET_X 15 // displacement of beval topleft corner from pointer #define EVAL_OFFSET_Y 10 #ifdef FEAT_BEVAL_GUI # include "gui_beval.pro" #endif #endif // BEVAL__H and FEAT_BEVAL_GUI