[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     0d72a4ce141c7213e4bbacb30f966c108dbcf7af
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Wed Jan 16 19:07:06 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Wed Jan 16 19:07:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=0d72a4ce

Fixed the scrollbar:

The height is now relative to the displayed list.
The position is fixed according of the state of the masked flags
filtering.

---
 ufed-curses-checklist.c |    5 +++++
 ufed-curses.c           |   31 +++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index b78a773..8461ffb 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -44,6 +44,7 @@ static void free_flags(void);
 
 /* external members */
 enum mask showMasked = show_unmasked; //!< Set whether to show masked, unmasked or both flags
+int firstNormalY = -1; //!< y of first not masked flag
 
 
 /* static functions */
@@ -133,6 +134,10 @@ static void read_flags(void) {
 		else
 			exit(-1);
 
+		/* record first not masked y if not done, yet */
+		if (firstNormalY < 0 && !flag->item.isMasked)
+			firstNormalY = flag->item.top;
+
 		/* check and set flag state */
 		line[state.end] = '\0';
 		if(state.end-state.start != 4)

diff --git a/ufed-curses.c b/ufed-curses.c
index d7ff8da..65ffe67 100644
--- a/ufed-curses.c
+++ b/ufed-curses.c
@@ -27,6 +27,7 @@ static struct item *items, *currentitem;
 /* external members */
 int topy, minwidth;
 extern enum mask showMasked;
+extern int firstNormalY;
 
 /* internal prototypes */
 static void checktermsize(void);
@@ -129,8 +130,34 @@ static void drawscrollbar(void) {
 	wattrset(w, COLOR_PAIR(3) | A_BOLD);
 	mvwaddch(w, 0, 0, ACS_UARROW);
 	wvline(w, ACS_CKBOARD, wHeight(Scrollbar)-3);
-	if(items->prev->top+items->prev->height > wHeight(List))
-		mvwaddch(w, 1+(wHeight(Scrollbar)-3)*topy/(items->prev->top+items->prev->height-(wHeight(List)-1)), 0, ACS_BLOCK);
+
+	/* The scrollbar location differs related to the
+	 * current filtering of masked flags.
+	 */
+	int bottomY    = items->prev->top + items->prev->height;
+	// Case 1: Masked flags are not displayed (the default)
+	int listHeight = bottomY - firstNormalY;
+	int listTopY   = topy    - firstNormalY;
+	if (show_masked == showMasked) {
+		// Case 2: Only masked flags are displayed
+		listHeight = firstNormalY;
+		listTopY   = topy;
+	}
+	else if (show_both == showMasked) {
+		// case 3: All flags are shown
+		listHeight = bottomY;
+		listTopY   = topy;
+	}
+
+	// Only show a scrollbar if the list is actually longer than can be displayed:
+	if (listHeight > wHeight(List)) {
+		int sbHeight = wHeight(Scrollbar) - 3;
+		int barStart = 1 + (sbHeight * listTopY / listHeight);
+		int barEnd   = barStart + (sbHeight * wHeight(List) / listHeight);
+		for ( ; barStart <= barEnd; ++barStart)
+			mvwaddch(w, barStart, 0, ACS_BLOCK);
+	}
+
 	mvwaddch(w, wHeight(Scrollbar)-2, 0, ACS_DARROW);
 	mvwaddch(w, wHeight(Scrollbar)-1, 0, ACS_VLINE);
 	wnoutrefresh(w);