diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rw-r--r-- | src/QuickMedia.cpp | 23 |
3 files changed, 18 insertions, 12 deletions
@@ -37,7 +37,7 @@ Press `Ctrl + R` to show related/channels video menu when watching a video (if s Press `Ctrl + T` when hovering over a manga chapter to start tracking manga after that chapter. This only works if AutoMedia is installed and accessible in PATH environment variable.\ Press `Backspace` to return to the preview item when reading replies in image board threads.\ Press `R` to paste the post number of the selected post into the post field (image boards).\ -Press `M` to begin writing a post to a thread (image boards), press `ESC` to cancel.\ +Press `I` to begin writing a post to a thread (image boards), press `ESC` to cancel.\ Press `1 to 9` or `Numpad 1 to 9` to select google captcha image when posting a comment on 4chan.\ Press `P` to preview the 4chan image of the selected row in full screen view, press `ESC` or `Backspace` to go back.\ Press `I` to switch between single image and scroll image view mode when reading manga.\ @@ -47,7 +47,7 @@ Press `Tab` to switch between username/password field in login panel.\ Press `Ctrl + C` to copy the url of the currently playing video to the clipboard (with timestamp).\ Press `Ctrl + V` to paste the content of your clipboard into the search bar.\ Press `Enter` to view image/video attached to matrix message, or to view the url in the message in quickmedia (youtube) or in the browser.\ -Press `M` to begin writing a message in a matrix room, press `ESC` to cancel.\ +Press `I` to begin writing a message in a matrix room, press `ESC` to cancel.\ Press `R` to reply to a message on matrix, press `ESC` to cancel.\ Press `E` to edit a message on matrix, press `ESC` to cancel. Currently only works for your own messages.\ Press `D` to delete a message on matrix. Currently deleting a message only deletes the event, so if you delete an edit then the original message wont be deleted.\ @@ -134,4 +134,5 @@ Test if glScissor doesn't break loading of embedded body item. Handle matrix token being invalidated while running. Update upload limit if its updated on the server (can it be updated while the server is running?). Editing a reply removes reply formatting (both in body and formatted_body). Element also does this when you edit a reply twice. This breaks element mobile that is unable to display replied-to messages without correct formatting (doesn't fetch the replied-to message). -Implement m.room.tombstone.
\ No newline at end of file +Implement m.room.tombstone. +Show a marker when a room uses encryption.
\ No newline at end of file diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 5d980f3..5fc5fb7 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -2528,7 +2528,7 @@ namespace QuickMedia { }, is_tor_enabled()); }; - Entry comment_input("Press m to begin writing a comment..."); + Entry comment_input("Press i to begin writing a comment..."); comment_input.draw_background = false; comment_input.set_editable(false); @@ -2596,6 +2596,7 @@ namespace QuickMedia { sf::Vector2f body_pos; sf::Vector2f body_size; bool redraw = true; + bool frame_skip_text_entry = false; sf::Event event; std::stack<int> comment_navigation_stack; @@ -2603,7 +2604,7 @@ namespace QuickMedia { while (current_page == PageType::IMAGE_BOARD_THREAD && window.isOpen()) { while (window.pollEvent(event)) { - if(navigation_stage == NavigationStage::REPLYING) { + if(navigation_stage == NavigationStage::REPLYING && !frame_skip_text_entry) { comment_input.process_event(event); // To prevent pressing enter in comment_input text submit from also immediately sending captcha solution.. is there no better solution? if(event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Enter) @@ -2715,10 +2716,13 @@ namespace QuickMedia { comment_input.append_text(std::move(text_to_add)); comment_input.move_caret_to_end(); } - } else if(navigation_stage == NavigationStage::VIEWING_COMMENTS && event.type == sf::Event::KeyReleased && event.key.code == sf::Keyboard::M) { - navigation_stage = NavigationStage::REPLYING; - comment_input.set_editable(true); - comment_input.move_caret_to_end(); + + if(event.key.code == sf::Keyboard::I) { + frame_skip_text_entry = true; + navigation_stage = NavigationStage::REPLYING; + comment_input.set_editable(true); + comment_input.move_caret_to_end(); + } } if(event.type == sf::Event::KeyPressed && navigation_stage == NavigationStage::SOLVING_POST_CAPTCHA) { @@ -2774,6 +2778,7 @@ namespace QuickMedia { } } } + frame_skip_text_entry = false; chat_input_height_full = comment_input.get_height() + chat_input_padding_y * 2.0f; @@ -3303,7 +3308,7 @@ namespace QuickMedia { read_marker_timeout_ms = 0; redraw = true; - Entry chat_input("Press m to begin writing a message..."); + Entry chat_input("Press i to begin writing a message..."); chat_input.draw_background = false; chat_input.set_editable(false); @@ -3754,7 +3759,7 @@ namespace QuickMedia { chat_input.set_editable(false); } - if(event.key.code == sf::Keyboard::M) { + if(event.key.code == sf::Keyboard::I) { frame_skip_text_entry = true; chat_input.set_editable(true); chat_state = ChatState::TYPING_MESSAGE; @@ -4248,7 +4253,7 @@ namespace QuickMedia { Message *message = (Message*)last_visible_item->userdata; // TODO: What if two messages have the same timestamp? if(message->timestamp > current_room->last_read_message_timestamp) { - read_marker_timeout_ms = read_marker_timeout_ms_default; + //read_marker_timeout_ms = read_marker_timeout_ms_default; current_room->last_read_message_timestamp = message->timestamp; // TODO: What if the message is no longer valid? setting_read_marker = true; |