mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-12 19:41:10 +00:00
feat: the second-screen Deck controls get the Gamepad tab (#895)
This commit is contained in:
1 parent
507ddac39d
commit
5aa245cf39
2 files changed
+4
-1
No files matched your search
@@ -1874,6 +1874,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
|||||||
onSteamMenu = ::tapSteamButton,
|
onSteamMenu = ::tapSteamButton,
|
||||||
onQam = ::tapQam,
|
onQam = ::tapQam,
|
||||||
onClose = { selectSecondScreenMode(SecondScreenMode.NONE) },
|
onClose = { selectSecondScreenMode(SecondScreenMode.NONE) },
|
||||||
|
pad = padBridge,
|
||||||
)
|
)
|
||||||
secondScreenPresentation = presentation
|
secondScreenPresentation = presentation
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import android.widget.HorizontalScrollView
|
|||||||
import android.widget.LinearLayout
|
import android.widget.LinearLayout
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import com.droiddeck.launcher.input.KeyboardHost
|
import com.droiddeck.launcher.input.KeyboardHost
|
||||||
|
import com.droiddeck.launcher.input.PadBridge
|
||||||
import com.droiddeck.launcher.input.PointerGestures
|
import com.droiddeck.launcher.input.PointerGestures
|
||||||
import com.droiddeck.launcher.input.SecondScreenMode
|
import com.droiddeck.launcher.input.SecondScreenMode
|
||||||
import com.droiddeck.launcher.input.TouchpadGestures
|
import com.droiddeck.launcher.input.TouchpadGestures
|
||||||
@@ -45,6 +46,7 @@ class SecondScreenPresentation(
|
|||||||
private val onSteamMenu: () -> Unit,
|
private val onSteamMenu: () -> Unit,
|
||||||
private val onQam: () -> Unit,
|
private val onQam: () -> Unit,
|
||||||
private val onClose: () -> Unit,
|
private val onClose: () -> Unit,
|
||||||
|
private val pad: PadBridge? = null,
|
||||||
) : Presentation(sessionActivity, display) {
|
) : Presentation(sessionActivity, display) {
|
||||||
private val root = LinearLayout(context).apply {
|
private val root = LinearLayout(context).apply {
|
||||||
orientation = LinearLayout.VERTICAL
|
orientation = LinearLayout.VERTICAL
|
||||||
@@ -114,7 +116,7 @@ class SecondScreenPresentation(
|
|||||||
when (currentMode) {
|
when (currentMode) {
|
||||||
SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad()
|
SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad()
|
||||||
SecondScreenMode.TERMINAL -> renderTerminal()
|
SecondScreenMode.TERMINAL -> renderTerminal()
|
||||||
SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam), weightParams())
|
SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad), weightParams())
|
||||||
SecondScreenMode.NONE -> Unit
|
SecondScreenMode.NONE -> Unit
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user