copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixed paint popup menu collision problems

Browse source
This commit is contained in:
Yousef Khadadeh 2026-04-02 13:45:46 +03:00
parent 2eb2672329
commit 60c12ce150
5 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/DrawingProgram/DrawingProgram.cpp
View file

@ -98,8 +98,6 @@ void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButton
}
}
else {
if(!rightClickPopupHoverOnClick)
clear_right_click_popup();
if(!world.main.g.gui.cursor_obstructed()) {
if(button.button == InputManager::MouseButton::LEFT && !controls.middleClickHeld) {
controls.leftClickHeld = true;
@ -389,7 +387,6 @@ void DrawingProgram::right_click_popup_gui() {
void DrawingProgram::set_right_click_popup_location(const Vector2f& newLoc) {
if(!rightClickPopupLocation.has_value() || rightClickPopupLocation.value() != newLoc) {
rightClickPopupLocation = newLoc;
rightClickPopupHoverOnClick = false;
world.main.g.gui.set_to_layout();
}
}
@ -398,7 +395,6 @@ void DrawingProgram::clear_right_click_popup() {
if(rightClickPopupLocation.has_value()) {
rightClickPopupLocation = std::nullopt;
world.main.g.gui.set_to_layout();
rightClickPopupHoverOnClick = false;
}
}

6
src/DrawingProgram/DrawingProgram.hpp
View file

@ -70,7 +70,9 @@ class DrawingProgram {
void input_pen_touch_callback(const InputManager::PenTouchCallbackArgs& touch);
void input_pen_motion_callback(const InputManager::PenMotionCallbackArgs& motion);
void input_pen_axis_callback(const InputManager::PenAxisCallbackArgs& axis);
bool rightClickPopupHoverOnClick = false;
void set_right_click_popup_location(const Vector2f& newLoc);
void clear_right_click_popup();
private:
void process_transform_message(const std::vector<std::pair<NetworkingObjects::NetObjID, CoordSpaceHelper>>& transforms);
@ -129,8 +131,6 @@ class DrawingProgram {
std::optional<Vector2f> rightClickPopupLocation;
void set_right_click_popup_location(const Vector2f& newLoc);
void clear_right_click_popup();
uint32_t nextID = 0;