Skip to content

Commit 2b132f9

Browse files
author
terrabyte25
committed
Implement shift button for deleting spells and add patch to work towards touchscreen control
1 parent 5173fa1 commit 2b132f9

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

app/src/main/java/ui/controls/Osc.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ class Osc(
308308
keyboardButton,
309309
OscImageButton("use", R.drawable.use, 940, 368, KeyEvent.KEYCODE_SPACE),
310310

311+
OscImageButton("shift", R.drawable.del, 140, 0, KeyEvent.KEYCODE_SHIFT_LEFT),
312+
311313
OscJoystickLeft("joystickLeft", 75, 400, 170, 0),
312314
OscJoystickRight("joystickRight", 650, 400, 170, 1)
313315
)

app/src/main/res/layout/screencontrols.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,16 @@
327327
android:scaleType="fitCenter"
328328
android:src="@drawable/use" />
329329

330+
<ImageButton
331+
android:id="@+id/buttonshift"
332+
android:layout_width="50dip"
333+
android:layout_height="50dip"
334+
android:background="@null"
335+
android:focusable="true"
336+
android:focusableInTouchMode="true"
337+
android:scaleType="fitCenter"
338+
android:src="@drawable/del" />
339+
330340
<Button
331341
android:id="@+id/buttonsize1"
332342
android:layout_width="50dip"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
2+
index abd483a72..3ab11ead4 100644
3+
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
4+
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
5+
@@ -1678,7 +1678,7 @@ namespace MWGui
6+
7+
bool WindowManager::getCursorVisible()
8+
{
9+
- return mCursorVisible && mCursorActive;
10+
+ return mCursorVisible;
11+
}
12+
13+
void WindowManager::trackWindow(Layout *layout, const std::string &name)

0 commit comments

Comments
 (0)