Mercurial > vim
view src/beval.h @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
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:15: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