Mercurial > vim
view src/beval.h @ 34682:a36144b38683 v9.1.0222
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Commit: https://github.com/vim/vim/commit/fe0a76b2bca12b13982ad66bafadc0d6c1681d00
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:47:32 2024 +0100
patch 9.1.0222: missing 'below' virt text if truncation precedes after/right text
Problem: When a line is truncated just before 'after'/'right' virtual
text and the line also has 'below' virtual text, then the
'below' virtual text would not be displayed, depending on the
order these text properties were added.
Solution: In the loop to make text properties active, skip instead of
break for 'after'/'right' virtual text properties that are
ignored due to truncation, so following 'below' text
properties can still be made active.
Similarly, a loop is needed to determine if a text property
follows at the end of the screen. (Dylan Thacker-Smith)
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:04 +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