Mercurial > vim
view src/gui_dwrite.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 | 808625d4b71b |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: */ /* * Author: MURAOKA Taro <koron.kaoriya@gmail.com> * * Contributors: * - Ken Takata * - Yasuhiro Matsumoto * * Copyright (C) 2013 MURAOKA Taro <koron.kaoriya@gmail.com> * THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE. */ #ifndef GUI_DWRITE_H #define GUI_DWRITE_H #ifdef __cplusplus extern "C" { #endif typedef struct DWriteContext DWriteContext; typedef struct DWriteRenderingParams { float gamma; float enhancedContrast; float clearTypeLevel; /* * pixelGeometry: * 0 - DWRITE_PIXEL_GEOMETRY_FLAT * 1 - DWRITE_PIXEL_GEOMETRY_RGB * 2 - DWRITE_PIXEL_GEOMETRY_BGR */ int pixelGeometry; /* * renderingMode: * 0 - DWRITE_RENDERING_MODE_DEFAULT * 1 - DWRITE_RENDERING_MODE_ALIASED * 2 - DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC * 3 - DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL * 4 - DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL * 5 - DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC * 6 - DWRITE_RENDERING_MODE_OUTLINE */ int renderingMode; /* * antialiasMode: * 0 - D2D1_TEXT_ANTIALIAS_MODE_DEFAULT * 1 - D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE * 2 - D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE * 3 - D2D1_TEXT_ANTIALIAS_MODE_ALIASED */ int textAntialiasMode; } DWriteRenderingParams; void DWrite_Init(void); void DWrite_Final(void); DWriteContext *DWriteContext_Open(void); void DWriteContext_BindDC(DWriteContext *ctx, HDC hdc, const RECT *rect); void DWriteContext_SetFont(DWriteContext *ctx, HFONT hFont); void DWriteContext_DrawText( DWriteContext *ctx, const WCHAR *text, int len, int x, int y, int w, int h, int cellWidth, COLORREF color, UINT fuOptions, const RECT *lprc, const INT *lpDx); void DWriteContext_FillRect(DWriteContext *ctx, const RECT *rc, COLORREF color); void DWriteContext_DrawLine(DWriteContext *ctx, int x1, int y1, int x2, int y2, COLORREF color); void DWriteContext_SetPixel(DWriteContext *ctx, int x, int y, COLORREF color); void DWriteContext_Scroll(DWriteContext *ctx, int x, int y, const RECT *rc); void DWriteContext_Flush(DWriteContext *ctx); void DWriteContext_Close(DWriteContext *ctx); void DWriteContext_SetRenderingParams( DWriteContext *ctx, const DWriteRenderingParams *params); DWriteRenderingParams *DWriteContext_GetRenderingParams( DWriteContext *ctx, DWriteRenderingParams *params); #ifdef __cplusplus } #endif #endif/*GUI_DWRITE_H*/