diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:19:41 +0200 |
| commit | 63ec5715054be18ac4db5675e067b41c955d03b9 (patch) | |
| tree | 42bb5764b05bd3bc5bffadb55f4375e6dce8a521 /app/bin/chotbar.c | |
| parent | 6c1a798b0302034a7fdcaf93b8f014e2e458c2a0 (diff) | |
| parent | e7d20cf352688bf717a01f4e6d9e6f497c2bea4c (diff) | |
Update upstream source from tag 'upstream/5.3.1Beta2'
Update to upstream version '5.3.1Beta2'
with Debian dir 36e53756d97319b1944d0ea744717abc9326f697
Diffstat (limited to 'app/bin/chotbar.c')
| -rw-r--r-- | app/bin/chotbar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/bin/chotbar.c b/app/bin/chotbar.c index a0e6332..90b2ca3 100644 --- a/app/bin/chotbar.c +++ b/app/bin/chotbar.c @@ -25,6 +25,7 @@ #include "ccornu.h" #include "track.h" #include "draw.h" +#include "include/toolbar.h" EXPORT DIST_T curBarScale = -1; EXPORT long hotBarLabels = 0; @@ -87,7 +88,7 @@ static void HotBarHighlight( int inx, DIST_T fixed_x ) } orig.y = 0; size.x = hotBarMap(inx).w - 2.0/hotBarD.dpi; - size.y = toolbarHeight; + size.y = ToolbarGetHeight(); #ifdef LATER printf( "HotBarHilite fixed_x:%0.3f X0:%d/%0.3f X:%d/%0.3f+%0.3f X=%0.3f\n", fixed_x, @@ -503,7 +504,7 @@ EXPORT void AddHotBarElement( } -static void ChangeHotBar( long changes ) +EXPORT void ChangeHotBar( long changes ) { #ifdef LATER int curFileIndex = -3; @@ -595,11 +596,11 @@ EXPORT void LayoutHotBar( void * redraw ) buttonWidth = wControlGetWidth((wControl_p)hotBarLeftB); buttonHeight = wControlGetHeight((wControl_p)hotBarLeftB); wControlSetPos( (wControl_p)hotBarLeftB, HOTBAR_LEFT, - toolbarHeight+(hbHeight-buttonHeight)/2 ); + ToolbarGetHeight() +(hbHeight-buttonHeight)/2 ); wControlSetPos( (wControl_p)hotBarRightB, winWidth-20-buttonWidth+HOTBAR_LEFT+1, - toolbarHeight+(hbHeight-buttonHeight)/2 ); + ToolbarGetHeight() +(hbHeight-buttonHeight)/2 ); wControlSetPos( (wControl_p)hotBarD.d, buttonWidth+HOTBAR_LEFT+1, - toolbarHeight ); + ToolbarGetHeight()); wDrawSetSize( hotBarD.d, winWidth-20-buttonWidth*2, hbHeight+2, redraw ); hotBarD.size.x = ((double)(winWidth-20 -buttonWidth*2))/hotBarD.dpi*hotBarD.scale; @@ -613,7 +614,7 @@ EXPORT void LayoutHotBar( void * redraw ) } else if (!redraw) { RedrawHotBar( NULL, NULL, 0, 0 ); } - toolbarHeight += hbHeight+3; + ToolbarSetHeight( ToolbarGetHeight() + hbHeight+3 ); } void HideHotBar( void ) |