mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-24 19:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8ef46ec39b into e6ed939952

Browse source
This commit is contained in:
JosJuice 2025-08-10 00:33:49 +08:00 • committed by GitHub
commit 0c4b4044db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/ProfileDialog.kt
View file

@ -46,10 +46,8 @@ class ProfileDialog : BottomSheetDialogFragment() {
binding.profileList.addItemDecoration(divider) binding.profileList.addItemDecoration(divider)
// You can't expand a bottom sheet with a controller/remote/other non-touch devices // You can't expand a bottom sheet with a controller/remote/other non-touch devices
val behavior: BottomSheetBehavior<View> = BottomSheetBehavior.from(view.parent as View) BottomSheetBehavior.from<View>(view.parent as View).state =
if (!resources.getBoolean(R.bool.hasTouch)) { BottomSheetBehavior.STATE_EXPANDED
behavior.state = BottomSheetBehavior.STATE_EXPANDED
}
} }
override fun onDestroyView() { override fun onDestroyView() {

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/AboutDialogFragment.kt
View file

@ -38,10 +38,8 @@ class AboutDialogFragment : BottomSheetDialogFragment() {
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
if (!resources.getBoolean(R.bool.hasTouch)) { BottomSheetBehavior.from<View>(view.parent as View).state =
BottomSheetBehavior.from<View>(view.parent as View).state = BottomSheetBehavior.STATE_EXPANDED
BottomSheetBehavior.STATE_EXPANDED
}
val wark = resources.getString(R.string.wark) val wark = resources.getString(R.string.wark)
val branch = String.format( val branch = String.format(

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/GridOptionDialogFragment.kt
View file

@ -44,11 +44,9 @@ class GridOptionDialogFragment : BottomSheetDialogFragment() {
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
// Pins fragment to the top of the dialog ensures the dialog is expanded in landscape by default // Ensure the dialog is expanded in landscape by default
if (!resources.getBoolean(R.bool.hasTouch)) { BottomSheetBehavior.from<View>(view.parent as View).state =
BottomSheetBehavior.from<View>(view.parent as View).state = BottomSheetBehavior.STATE_EXPANDED
BottomSheetBehavior.STATE_EXPANDED
}
if (activity is AppCompatActivity) { if (activity is AppCompatActivity) {
setUpCoverButtons() setUpCoverButtons()