Mercurial > vim
comparison src/gui.c @ 810:9f345c48220b v7.0c
updated for version 7.0c
author | vimboss |
---|---|
date | Mon, 27 Mar 2006 17:01:56 +0000 |
parents | a1a08851eac8 |
children | d2c169a725c8 |
comparison
equal
deleted
inserted
replaced
809:4f1b94b51e99 | 810:9f345c48220b |
---|---|
1140 #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_MSWIN) | 1140 #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_MSWIN) |
1141 if (vim_strchr(p_go, GO_TOOLBAR) != NULL) | 1141 if (vim_strchr(p_go, GO_TOOLBAR) != NULL) |
1142 text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; | 1142 text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; |
1143 #endif | 1143 #endif |
1144 | 1144 |
1145 #if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) | |
1146 if (gui_has_tabline()) | |
1147 text_area_y += TABLINE_HEIGHT; | |
1148 #endif | |
1149 | |
1145 #if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) | 1150 #if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) |
1146 if (vim_strchr(p_go, GO_TOOLBAR) != NULL) | 1151 if (vim_strchr(p_go, GO_TOOLBAR) != NULL) |
1147 { | 1152 { |
1148 # ifdef FEAT_GUI_ATHENA | 1153 # ifdef FEAT_GUI_ATHENA |
1149 gui_mch_set_toolbar_pos(0, text_area_y, | 1154 gui_mch_set_toolbar_pos(0, text_area_y, |
1220 # if defined(FEAT_GUI_MSWIN) && defined(FEAT_TOOLBAR) | 1225 # if defined(FEAT_GUI_MSWIN) && defined(FEAT_TOOLBAR) |
1221 base_height += (TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT); | 1226 base_height += (TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT); |
1222 # else | 1227 # else |
1223 base_height += gui.toolbar_height; | 1228 base_height += gui.toolbar_height; |
1224 # endif | 1229 # endif |
1230 # endif | |
1231 # if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) | |
1232 if (gui_has_tabline()) | |
1233 base_height += TABLINE_HEIGHT; | |
1225 # endif | 1234 # endif |
1226 # ifdef FEAT_FOOTER | 1235 # ifdef FEAT_FOOTER |
1227 if (vim_strchr(p_go, GO_FOOTER) != NULL) | 1236 if (vim_strchr(p_go, GO_FOOTER) != NULL) |
1228 base_height += gui.footer_height; | 1237 base_height += gui.footer_height; |
1229 # endif | 1238 # endif |
3922 y += TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; | 3931 y += TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; |
3923 # endif | 3932 # endif |
3924 # endif | 3933 # endif |
3925 #endif | 3934 #endif |
3926 | 3935 |
3936 #if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) | |
3937 if (gui_has_tabline()) | |
3938 y += TABLINE_HEIGHT; | |
3939 #endif | |
3940 | |
3927 #ifdef FEAT_WINDOWS | 3941 #ifdef FEAT_WINDOWS |
3928 if (wp->w_winrow == 0) | 3942 if (wp->w_winrow == 0) |
3929 #endif | 3943 #endif |
3930 { | 3944 { |
3931 /* Height of top scrollbar includes width of top border */ | 3945 /* Height of top scrollbar includes width of top border */ |