Improve virtual keyboard and USB devices on Android
Some checks are pending
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 Win32 os:windows-2022]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 x64 os:windows-2022]) (push) Waiting to run
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 ARM os:windows-2022]) (push) Waiting to run
CD / Create Pi Mono Setup (push) Blocked by required conditions
CD / Publishing (push) Blocked by required conditions

This commit is contained in:
Lorenzooone 2025-11-09 16:55:10 +01:00
parent 1cfd1a7ee5
commit 379bf2286a
4 changed files with 27 additions and 7 deletions

View File

@ -1,9 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<usb-device vendor-id="1027" product-id="24596" class="0" subclass="0" protocol="0" />
<usb-device vendor-id="1874" product-id="34323" class="0" subclass="0" protocol="0" />
<usb-device vendor-id="1204" product-id="34323" class="0" subclass="0" protocol="0" />
<usb-device vendor-id="1204" product-id="4100" class="0" subclass="0" protocol="0" />
<usb-device vendor-id="5840" product-id="1607" />
<usb-device vendor-id="5840" product-id="1699" />
<usb-device vendor-id="1027" product-id="24596" />
<usb-device vendor-id="1027" product-id="24606" />
<usb-device vendor-id="1027" product-id="24607" />
<usb-device vendor-id="1027" product-id="24618" />
<usb-device vendor-id="1027" product-id="24619" />
<usb-device vendor-id="1027" product-id="24620" />
<usb-device vendor-id="1027" product-id="24621" />
<usb-device vendor-id="1027" product-id="24623" />
<usb-device vendor-id="1874" product-id="34323" />
<usb-device vendor-id="1204" product-id="34323" />
<usb-device vendor-id="1204" product-id="4100" />
<usb-device vendor-id="3950" product-id="1024" />
<usb-device vendor-id="3950" product-id="1025" />
<usb-device vendor-id="3950" product-id="1026" />
<usb-device vendor-id="3950" product-id="1027" />
<usb-device vendor-id="3950" product-id="1028" />
<usb-device vendor-id="3950" product-id="1280" />
<usb-device vendor-id="3950" product-id="1281" />
<usb-device vendor-id="3950" product-id="1282" />
</resources>

View File

@ -3,4 +3,5 @@
SFML_FOLDER=$1
ARCH_CHOSEN=$2
(cd ${SFML_FOLDER}/build/${ARCH_CHOSEN} ; make -j ; make install)
BUILD_FOLDER=${SFML_FOLDER}/build/${ARCH_CHOSEN}
(cd ${BUILD_FOLDER} ; make -j ; make install)

View File

@ -5,5 +5,5 @@ ARCH_CHOSEN=$2
STL_CHOSEN=$3
RELEASE_TYPE=$4
(cd ${SFML_FOLDER} ; mkdir -p build/${ARCH_CHOSEN})
(cd ${SFML_FOLDER}/build/${ARCH_CHOSEN} ; cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=${ANDROID_NDK_HOME} -DCMAKE_ANDROID_ARCH_ABI=${ARCH_CHOSEN} -DCMAKE_ANDROID_STL_TYPE=${STL_CHOSEN} -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} ../.. )
BUILD_FOLDER=${SFML_FOLDER}/build/${ARCH_CHOSEN}
(mkdir -p ${BUILD_FOLDER} ; cd ${BUILD_FOLDER} ; cmake -DCMAKE_SYSTEM_NAME=Android -DCMAKE_ANDROID_NDK=${ANDROID_NDK_HOME} -DCMAKE_ANDROID_ARCH_ABI=${ARCH_CHOSEN} -DCMAKE_ANDROID_STL_TYPE=${STL_CHOSEN} -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} ../.. )

View File

@ -526,6 +526,8 @@ void OptimizeSerialKeyAddMenu::right_code() {
}
void OptimizeSerialKeyAddMenu::quit_textbox(bool change_option_selected) {
if(this->is_inside_textbox && change_option_selected)
sf::Keyboard::setVirtualKeyboardVisible(false);
this->is_inside_textbox = false;
if(change_option_selected)
this->future_data.option_selected = this->get_next_option_selected_after_key_input() + this->elements_start_id;