From 13681189d41f3d5c6c132d92b7451fea151fb713 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 3 Jul 2020 03:10:50 +0200 Subject: bind I to switching between single image and scroll mode --- src/ImageViewer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/ImageViewer.cpp') diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp index b567e1b..41993ad 100644 --- a/src/ImageViewer.cpp +++ b/src/ImageViewer.cpp @@ -115,7 +115,7 @@ namespace QuickMedia { return true; } - bool ImageViewer::draw(sf::RenderWindow &window) { + ImageViewerAction ImageViewer::draw(sf::RenderWindow &window) { const double frame_delta = frame_timer.restart().asSeconds(); const double scroll_speed_key_input = 450.0; const double scroll_speed_mouse_wheel = 450.0; @@ -134,7 +134,7 @@ namespace QuickMedia { if (event.type == sf::Event::Closed) { //current_page = Page::EXIT; window.close(); - return false; + return ImageViewerAction::RETURN; } else if(event.type == sf::Event::Resized) { window_size.x = event.size.width; window_size.y = event.size.height; @@ -149,7 +149,9 @@ namespace QuickMedia { } else if(event.key.code == sf::Keyboard::Down) { scroll_speed -= scroll_speed_key_input * frame_delta; } else if(event.key.code == sf::Keyboard::Escape) { - return false; + return ImageViewerAction::RETURN; + } else if(event.key.code == sf::Keyboard::I) { + return ImageViewerAction::SWITCH_TO_SINGLE_IMAGE_MODE; } } else if(event.type == sf::Event::MouseWheelScrolled && event.mouseWheelScroll.wheel == sf::Mouse::VerticalWheel) { scroll_speed += scroll_speed_mouse_wheel * event.mouseWheelScroll.delta * frame_delta; @@ -224,7 +226,7 @@ namespace QuickMedia { ++i; } - return true; + return ImageViewerAction::NONE; } int ImageViewer::get_focused_page() const { -- cgit v1.2.3