diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-19 13:04:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 13:04:20 +0200 |
| commit | c7b425ed9c1a085ee648a11d037373af5df1148a (patch) | |
| tree | 7c83ff4a23b34e171dfd2c7693097e30ae5c4830 /scene/gui | |
| parent | c9498e12a503697011e7297e5393f1fabb54fb3a (diff) | |
| parent | bc9f9b1c6ae0e5858790fe2463a175b451580fba (diff) | |
Merge pull request #5259 from neikeq/pr-textedit-zoom
TextEdit: Change font size with Ctrl+Mouse Wheel Up/Down
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 49d7527786..c08247095a 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1452,10 +1452,10 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { } if (mb.pressed) { - if (mb.button_index==BUTTON_WHEEL_UP) { + if (mb.button_index==BUTTON_WHEEL_UP && !mb.mod.command) { v_scroll->set_val( v_scroll->get_val() -3 ); } - if (mb.button_index==BUTTON_WHEEL_DOWN) { + if (mb.button_index==BUTTON_WHEEL_DOWN && !mb.mod.command) { v_scroll->set_val( v_scroll->get_val() +3 ); } if (mb.button_index==BUTTON_WHEEL_LEFT) { |