Merge pull request #4652 from Thanatomanic/scroll-speed

Scrolling speed changed to height of thumbnail.
This commit is contained in:
Ingo Weyrich
2018-07-01 18:35:19 +02:00
committed by GitHub
2 changed files with 7 additions and 3 deletions

View File

@@ -490,6 +490,7 @@ void FileCatalog::exifInfoButtonToggled()
} }
fileBrowser->refreshThumbImages (); fileBrowser->refreshThumbImages ();
refreshHeight();
} }
void FileCatalog::on_realize() void FileCatalog::on_realize()

View File

@@ -501,8 +501,8 @@ void ThumbBrowserBase::configScrollBars ()
vscroll.get_adjustment()->set_upper (inH); vscroll.get_adjustment()->set_upper (inH);
hscroll.get_adjustment()->set_lower (0); hscroll.get_adjustment()->set_lower (0);
vscroll.get_adjustment()->set_lower (0); vscroll.get_adjustment()->set_lower (0);
hscroll.get_adjustment()->set_step_increment (32); hscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
vscroll.get_adjustment()->set_step_increment (32); vscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
hscroll.get_adjustment()->set_page_increment (iw); hscroll.get_adjustment()->set_page_increment (iw);
vscroll.get_adjustment()->set_page_increment (ih); vscroll.get_adjustment()->set_page_increment (ih);
hscroll.get_adjustment()->set_page_size (iw); hscroll.get_adjustment()->set_page_size (iw);
@@ -519,6 +519,9 @@ void ThumbBrowserBase::configScrollBars ()
} else { } else {
vscroll.show(); vscroll.show();
} }
} else { // hide scrollbars when a filter is applied which returns no files
hscroll.hide();
vscroll.hide();
} }
} }
@@ -567,7 +570,7 @@ void ThumbBrowserBase::arrangeFiles()
MYREADERLOCK_RELEASE(l); MYREADERLOCK_RELEASE(l);
// This will require a Writer access // This will require a Writer access
resizeThumbnailArea(currx, rowHeight); resizeThumbnailArea(currx, !fd.empty() ? fd[0]->getEffectiveHeight() : rowHeight);
} else { } else {
const int availWidth = internal.get_width(); const int availWidth = internal.get_width();