From f214ba12f0889ba59d89dd5d7f0d2d5cacafdec5 Mon Sep 17 00:00:00 2001 From: Yousef Khadadeh Date: Sat, 16 May 2026 22:14:02 +0300 Subject: [PATCH] Take the brush pressure off option into account --- src/DrawingProgram/Tools/BrushTool.cpp | 4 ++-- src/Toolbar.cpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/DrawingProgram/Tools/BrushTool.cpp b/src/DrawingProgram/Tools/BrushTool.cpp index 9314f62..f8aa11a 100644 --- a/src/DrawingProgram/Tools/BrushTool.cpp +++ b/src/DrawingProgram/Tools/BrushTool.cpp @@ -81,7 +81,7 @@ void BrushTool::input_mouse_button_on_canvas_callback(const InputManager::MouseB if(button.button == InputManager::MouseButton::LEFT) { auto& toolConfig = drawP.world.main.toolConfig; if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) { - if(button.deviceType == InputManager::MouseDeviceType::PEN) { + if(button.deviceType == InputManager::MouseDeviceType::PEN && drawP.world.main.conf.tabletOptions.pressureAffectsBrushWidth) { penWidth = drawP.world.main.input.pen.pressure; if(penWidth != 0.0f) { float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize; @@ -177,7 +177,7 @@ void BrushTool::input_mouse_motion_callback(const InputManager::MouseMotionCallb } void BrushTool::input_pen_axis_callback(const InputManager::PenAxisCallbackArgs& axis) { - if(axis.axis == SDL_PEN_AXIS_PRESSURE) { + if(axis.axis == SDL_PEN_AXIS_PRESSURE && drawP.world.main.conf.tabletOptions.pressureAffectsBrushWidth) { penWidth = axis.value; if(penWidth != 0.0f) { float brushMinSize = drawP.world.main.conf.tabletOptions.brushMinimumSize; diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp index 68403a3..4a2e1ff 100644 --- a/src/Toolbar.cpp +++ b/src/Toolbar.cpp @@ -1711,7 +1711,9 @@ void Toolbar::general_settings_inner_gui() { } case GSETTINGS_DEBUG: { general_scroll_area("debug settings menu", [&] { - checkbox_boolean_field(gui, "use mobile UI", "Use mobile UI (requires restart)", &main.conf.mobileUI); + #ifndef __EMSCRIPTEN__ + checkbox_boolean_field(gui, "use mobile UI", "Use mobile UI (requires restart)", &main.conf.mobileUI); + #endif input_scalars_field(gui, "jump transition easing", "Jump easing", &main.conf.jumpTransitionEasing, 4, -10.0f, 10.0f, { .decimalPrecision = 2 }); input_scalar_field(gui, "image load max threads", "Maximum image loading threads", &ImageResourceDisplay::IMAGE_LOAD_THREAD_COUNT_MAX, 1, 10000); text_label_light(gui, "Cache related settings");