summaryrefslogtreecommitdiffstats
path: root/src/gui.c
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-01-16 14:15:49 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-16 14:15:49 +0000
commitc81e9bf4f07d350b860b934aa6bf0c2a7c91d07e (patch)
tree70da1af5033a573951ecf9f52e4c3854f17a36c7 /src/gui.c
parentf6ebc820041b3f77794297026b46c1ebbc279a3a (diff)
patch 8.2.4109: MS-Windows: high dpi support is outdatedv8.2.4109
Problem: MS-Windows: high dpi support is outdated. Solution: Improve High DPI support by using PerMonitorV2. (closes #9525, closes #3102)
Diffstat (limited to 'src/gui.c')
-rw-r--r--src/gui.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/gui.c b/src/gui.c
index 4aae106e50..2c2963d121 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1433,10 +1433,6 @@ gui_position_components(int total_width UNUSED)
if (gui.menu_is_active)
text_area_y += gui.menu_height;
#endif
-#if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_MSWIN)
- if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
- text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT;
-#endif
# if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
|| defined(FEAT_GUI_MOTIF))
@@ -1445,7 +1441,7 @@ gui_position_components(int total_width UNUSED)
#endif
#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \
- || defined(FEAT_GUI_HAIKU))
+ || defined(FEAT_GUI_HAIKU) || defined(FEAT_GUI_MSWIN))
if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
{
# if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_HAIKU)
@@ -1529,11 +1525,7 @@ gui_get_base_height(void)
# endif
# ifdef FEAT_TOOLBAR
if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
-# if defined(FEAT_GUI_MSWIN) && defined(FEAT_TOOLBAR)
- base_height += (TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT);
-# else
base_height += gui.toolbar_height;
-# endif
# endif
# if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_HAIKU))
@@ -4342,13 +4334,7 @@ gui_update_scrollbars(
#if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_ATHENA) \
|| defined(FEAT_GUI_HAIKU))
if (vim_strchr(p_go, GO_TOOLBAR) != NULL)
-# if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_HAIKU)
y += gui.toolbar_height;
-# else
-# ifdef FEAT_GUI_MSWIN
- y += TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT;
-# endif
-# endif
#endif
#if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_HAIKU)