ft2-clone

commit a27852654d9784d36f24478dff46df1e74cb5065
parent 53456ab178ac8f0e9399af1cf87122a2fc479fe8
Author: Olav Sørensen <olav.sorensen@live.no>
Date:   Wed, 13 Jan 2021 21:35:52 +0100

Don't cache scrollbar parameters (caused stupid bugs)

Diffstat:
M
src/ft2_help.c
 | 
3
---
M
src/ft2_pattern_ed.c
 | 
11
-----------
M
src/ft2_scrollbars.c
 | 
23
-----------------------
M
src/ft2_scrollbars.h
 | 
1
-

4 files changed, 0 insertions(+), 38 deletions(-)
diff --git a/src/ft2_help.c b/src/ft2_help.c
@@ -438,9 +438,6 @@ static void setHelpSubject(uint8_t Nr)
 	fHlp_Nr = Nr;
 	fHlp_Line = 0;
 
-	// force update even if new pos value was to be the same as old
-	scrollBars[SB_HELP_SCROLL].oldPos = UINT32_MAX;
-
 	setScrollBarEnd(SB_HELP_SCROLL, subjLen[fHlp_Nr]);
 	setScrollBarPos(SB_HELP_SCROLL, 0, false);
 }
diff --git a/src/ft2_pattern_ed.c b/src/ft2_pattern_ed.c
@@ -362,10 +362,7 @@ void cursorChannelLeft(void)
 	{
 		cursor.ch = (uint8_t)(song.antChn - 1);
 		if (ui.pattChanScrollShown)
-		{
-			scrollBars[SB_CHAN_SCROLL].oldPos = UINT32_MAX; // kludge
 			setScrollBarPos(SB_CHAN_SCROLL, song.antChn, true);
-		}
 	}
 	else
 	{
@@ -386,10 +383,7 @@ void cursorChannelRight(void)
 	{
 		cursor.ch = 0;
 		if (ui.pattChanScrollShown)
-		{
-			scrollBars[SB_CHAN_SCROLL].oldPos = UINT32_MAX; // kludge
 			setScrollBarPos(SB_CHAN_SCROLL, 0, true);
-		}
 	}
 	else
 	{
@@ -603,11 +597,6 @@ static void updatePatternEditorGUI(void)
 			p->y = iSwitchY[i & 7];
 		}
 	}
-
-	// force update even if new values were to be the same as the old ones
-	scrollBars[SB_POS_ED].oldEnd = UINT32_MAX;
-	scrollBars[SB_POS_ED].oldPage = UINT32_MAX;
-	scrollBars[SB_POS_ED].oldPos = UINT32_MAX;
 }
 
 void patternEditorExtended(void)
diff --git a/src/ft2_scrollbars.c b/src/ft2_scrollbars.c
@@ -377,11 +377,6 @@ void setScrollBarPos(uint16_t scrollBarID, uint32_t pos, bool triggerCallBack)
 	assert(scrollBarID < NUM_SCROLLBARS);
 	scrollBar_t *scrollBar = &scrollBars[scrollBarID];
 
-	if (scrollBar->oldPos == pos)
-		return;
-
-	scrollBar->oldPos = pos;
-
 	if (scrollBar->page == 0)
 	{
 		scrollBar->pos = 0;
@@ -429,11 +424,6 @@ void setScrollBarEnd(uint16_t scrollBarID, uint32_t end)
 	if (end < 1)
 		end = 1;
 
-	if (scrollBar->oldEnd == end)
-		return;
-
-	scrollBar->oldEnd = end;
-
 	scrollBar->end = end;
 	
 	bool setPos = false;
@@ -466,11 +456,6 @@ void setScrollBarPageLength(uint16_t scrollBarID, uint32_t pageLength)
 	if (pageLength < 1)
 		pageLength = 1;
 
-	if (scrollBar->oldPage == pageLength)
-		return;
-
-	scrollBar->oldPage = pageLength;
-
 	scrollBar->page = pageLength;
 	if (scrollBar->end > 0)
 	{
@@ -675,14 +660,6 @@ void handleScrollBarsWhileMouseDown(void)
 
 void initializeScrollBars(void)
 {
-	scrollBar_t *scrollBar = scrollBars;
-	for (int32_t i = 0; i < NUM_SCROLLBARS; i++, scrollBar++)
-	{
-		scrollBar->oldEnd = UINT32_MAX;
-		scrollBar->oldPage = UINT32_MAX;
-		scrollBar->oldPos = UINT32_MAX;
-	}
-
 	// pattern editor
 	setScrollBarPageLength(SB_CHAN_SCROLL, 8);
 	setScrollBarEnd(SB_CHAN_SCROLL, 8);
diff --git a/src/ft2_scrollbars.h b/src/ft2_scrollbars.h
@@ -75,7 +75,6 @@ typedef struct scrollBar_t // DO NOT TOUCH!
 	bool visible;
 	uint8_t state;
 	uint32_t pos, page, end;
-	uint32_t oldPos, oldPage, oldEnd;
 	uint16_t thumbX, thumbY, thumbW, thumbH, realThumbLength;
 } scrollBar_t;