Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-04-24 23:17:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix possible issue with rendering for non-transparent supporting OSs

Browse Source
This commit is contained in:
Lorenzooone 2024-05-19 17:19:54 +02:00
parent 0913d6b8c0
commit af207075fa
4 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -137,7 +137,7 @@ add_dependencies(${OUTPUT_NAME} FTD3XX_BUILD_PROJECT CMakeBin2C)
target_link_libraries(${OUTPUT_NAME} PRIVATE sfml-graphics sfml-audio sfml-window sfml-system ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER}/${FTD3XX_LIB})
target_link_directories(${OUTPUT_NAME} PRIVATE ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER})
target_include_directories(${OUTPUT_NAME} PRIVATE ${ftd3xx_BINARY_DIR}/${FTD3XX_SUBFOLDER} ${TOOLS_DATA_DIR} ${CMAKE_SOURCE_DIR}/include)
target_compile_features(${OUTPUT_NAME} PRIVATE cxx_std_17)
target_compile_features(${OUTPUT_NAME} PRIVATE cxx_std_20)
target_compile_options(${OUTPUT_NAME} PRIVATE ${EXTRA_LINUX_CXX_FLAGS})
target_compile_features(CMakeBin2C PRIVATE cxx_std_17)

5
include/OptionSelectionMenu.hpp
View File

@ -94,8 +94,9 @@ private:
void left_code();
void right_code();
void option_selection_handling();
bool is_curr_option_location_left();
bool is_curr_option_location_multichoice();
bool is_option_location_left(int option);
bool is_option_element(int option);
bool is_option_location_multichoice(int option);
void decrement_selected_option(bool is_simple);
void increment_selected_option(bool is_simple);
};

60
source/OptionSelectionMenu.cpp
View File

@ -70,8 +70,8 @@ void OptionSelectionMenu::after_class_setup_connected_values() {
this->title_back_x_start_id = 0;
this->elements_start_id = num_title_back_x_elements + title_back_x_start_id;
this->page_elements_start_id = elements_start_id + num_elements_per_screen;
this->back_x_id = title_back_x_start_id;
this->title_id = title_back_x_start_id + 1;
this->back_x_id = title_back_x_start_id + 1;
this->title_id = title_back_x_start_id;
this->prev_page_id = page_elements_start_id;
this->info_page_id = page_elements_start_id + 1;
this->next_page_id = page_elements_start_id + 2;
@ -93,23 +93,27 @@ void OptionSelectionMenu::reset_data() {
this->future_data.page = 0;
}
bool OptionSelectionMenu::is_curr_option_location_left() {
bool OptionSelectionMenu::is_option_location_left(int option) {
bool location_left = true;
if(this->future_data.option_selected == this->next_page_id)
if(option == this->next_page_id)
location_left = false;
else if((this->future_data.option_selected >= this->elements_start_id) && (this->future_data.option_selected <= (this->elements_start_id + this->num_elements_per_screen)) && (((this->future_data.option_selected - this->elements_start_id) % this->single_option_multiplier) == 2))
else if((option >= this->elements_start_id) && (option <= (this->elements_start_id + this->num_elements_per_screen)) && (((option - this->elements_start_id) % this->single_option_multiplier) == 2))
location_left = false;
return location_left;
}
bool OptionSelectionMenu::is_curr_option_location_multichoice() {
bool OptionSelectionMenu::is_option_element(int option) {
return (option >= this->elements_start_id) && (option < (this->elements_start_id + this->num_elements_per_screen));
}
bool OptionSelectionMenu::is_option_location_multichoice(int option) {
bool location_left = true;
if((this->future_data.option_selected == this->next_page_id) || (this->future_data.option_selected == this->prev_page_id))
if((option == this->next_page_id) || (option == this->prev_page_id))
return true;
if((this->future_data.option_selected >= this->elements_start_id) && (this->future_data.option_selected <= (this->elements_start_id + this->num_elements_per_screen)) && (((this->future_data.option_selected - this->elements_start_id) % this->single_option_multiplier) != 0))
if(this->is_option_element(option) && (((option - this->elements_start_id) % this->single_option_multiplier) != 0))
return true;
return false;
@ -120,8 +124,9 @@ void OptionSelectionMenu::decrement_selected_option(bool is_simple) {
this->future_data.option_selected = this->elements_start_id;
return;
}
bool location_left = this->is_curr_option_location_left();
bool multichoice = this->is_curr_option_location_multichoice();
bool location_left = this->is_option_location_left(this->future_data.option_selected);
bool multichoice = this->is_option_location_multichoice(this->future_data.option_selected);
bool was_element = this->is_option_element(this->future_data.option_selected);
if(!is_simple) {
if(this->future_data.option_selected == this->next_page_id)
this->future_data.option_selected = this->prev_page_id;
@ -130,6 +135,8 @@ void OptionSelectionMenu::decrement_selected_option(bool is_simple) {
this->future_data.option_selected -= this->single_option_multiplier - 1;
else
this->future_data.option_selected -= 1;
if(was_element && !this->is_option_element(this->future_data.option_selected))
this->future_data.option_selected = this->elements_start_id;
}
}
do {
@ -144,22 +151,12 @@ void OptionSelectionMenu::increment_selected_option(bool is_simple) {
this->future_data.option_selected = this->elements_start_id;
return;
}
bool location_left = this->is_curr_option_location_left();
if(is_simple || location_left) {
if((!is_simple) && (this->future_data.option_selected != this->prev_page_id))
this->future_data.option_selected += 1;
do {
this->future_data.option_selected += 1;
if(this->future_data.option_selected >= this->num_elements_displayed_per_screen)
this->future_data.option_selected = 0;
} while(!(this->selectable_labels[this->future_data.option_selected] && this->future_enabled_labels[this->future_data.option_selected]));
}
else {
bool success = false;
bool location_left = this->is_option_location_left(this->future_data.option_selected);
bool success = false;
if(!(is_simple || location_left)) {
do {
this->future_data.option_selected += this->single_option_multiplier;
if(this->future_data.option_selected >= this->num_elements_displayed_per_screen) {
this->future_data.option_selected = 0;
break;
}
for(int i = 0; i < this->single_option_multiplier; i++) {
@ -171,6 +168,15 @@ void OptionSelectionMenu::increment_selected_option(bool is_simple) {
}
} while(!success);
}
if(!success) {
if((!is_simple) && this->is_option_element(this->future_data.option_selected))
this->future_data.option_selected += 1;
do {
this->future_data.option_selected += 1;
if(this->future_data.option_selected >= this->num_elements_displayed_per_screen)
this->future_data.option_selected = 0;
} while(!(this->selectable_labels[this->future_data.option_selected] && this->future_enabled_labels[this->future_data.option_selected]));
}
}
void OptionSelectionMenu::reset_output_option() {
@ -308,8 +314,8 @@ void OptionSelectionMenu::down_code(bool is_simple) {
void OptionSelectionMenu::left_code() {
if(!this->can_execute_action())
return;
bool location_left = this->is_curr_option_location_left();
bool multichoice = this->is_curr_option_location_multichoice();
bool location_left = this->is_option_location_left(this->future_data.option_selected);
bool multichoice = this->is_option_location_multichoice(this->future_data.option_selected);
if(multichoice && location_left)
this->option_selection_handling();
else if(multichoice && (this->future_data.option_selected != this->next_page_id)) {
@ -325,8 +331,8 @@ void OptionSelectionMenu::left_code() {
void OptionSelectionMenu::right_code() {
if(!this->can_execute_action())
return;
bool location_left = this->is_curr_option_location_left();
bool multichoice = this->is_curr_option_location_multichoice();
bool location_left = this->is_option_location_left(this->future_data.option_selected);
bool multichoice = this->is_option_location_multichoice(this->future_data.option_selected);
if(multichoice && (!location_left))
this->option_selection_handling();
else if(multichoice && (this->future_data.option_selected != this->prev_page_id)) {

2
source/cc3dsfs.cpp
View File

@ -202,7 +202,7 @@ static void mainVideoOutputCall(AudioData* audio_data, CaptureData* capture_data
OutTextData out_text_data;
out_text_data.consumed = true;
#if not(defined(_WIN32) || defined(_WIN64))
#if !(defined(_WIN32) || defined(_WIN64))
std::string cfg_dir = std::string(std::getenv("HOME")) + "/.config/" + std::string(NAME);
#else
std::string cfg_dir = ".config/" + std::string(NAME);