From 3dce4e2b9200a1cd4eca50147203cb34a31e0ef3 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 5 Jun 2021 12:13:08 +0200 Subject: Add covers to mangadex, remove arrow left/right, require alt --- src/Tabs.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/Tabs.cpp') diff --git a/src/Tabs.cpp b/src/Tabs.cpp index e1a0d86..390b088 100644 --- a/src/Tabs.cpp +++ b/src/Tabs.cpp @@ -62,17 +62,19 @@ namespace QuickMedia { void Tabs::on_event(sf::Event &event) { if(event.type == sf::Event::KeyPressed && !tabs.empty()) { - if(((!tabs[selected_tab].body->can_move_left() || event.key.alt) && (event.key.code == sf::Keyboard::Left || (event.key.control && event.key.code == sf::Keyboard::H))) - || (event.key.code == sf::Keyboard::Tab && event.key.shift)) - { + bool move_left = event.key.alt && (event.key.code == sf::Keyboard::Left || (event.key.control && event.key.code == sf::Keyboard::H)); + move_left |= (event.key.code == sf::Keyboard::Tab && event.key.shift); + + bool move_right = event.key.alt && (event.key.code == sf::Keyboard::Right || (event.key.control && event.key.code == sf::Keyboard::L)); + move_right |= (event.key.code == sf::Keyboard::Tab && !event.key.shift); + + if(move_left) { if(selected_tab > 0) move_selected_tab(selected_tab - 1); - } else if(((!tabs[selected_tab].body->can_move_right() || event.key.alt) && (event.key.code == sf::Keyboard::Right || (event.key.control && event.key.code == sf::Keyboard::L))) - || (event.key.code == sf::Keyboard::Tab && !event.key.shift)) - { + } else if(move_right) { if(selected_tab < (int)tabs.size() - 1) move_selected_tab(selected_tab + 1); - } else if(event.key.control && event.key.code >= sf::Keyboard::Num1 && event.key.code <= sf::Keyboard::Num9) { + } else if(event.key.alt && event.key.code >= sf::Keyboard::Num1 && event.key.code <= sf::Keyboard::Num9) { const int tab_target = event.key.code - sf::Keyboard::Num1; if(tab_target < (int)tabs.size()) move_selected_tab(tab_target); -- cgit v1.2.3