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

Official Release 1.1.0

Browse Source
This commit is contained in:
Lorenzooone
2024-07-02 07:37:22 +02:00
parent 6109b02f80
commit e9084745b9
7 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Menus/ResolutionMenu.cpp
View File

@@ -23,8 +23,9 @@ void ResolutionMenu::class_setup() {
this->show_title = true;
}
void ResolutionMenu::insert_data(std::vector<sf::VideoMode>* possible_resolutions) {
void ResolutionMenu::insert_data(std::vector<sf::VideoMode>* possible_resolutions, const sf::VideoMode &desktop_resolution) {
this->possible_resolutions = possible_resolutions;
this->desktop_resolution = desktop_resolution;
this->prepare_options();
}
@@ -50,8 +51,7 @@ sf::VideoMode ResolutionMenu::get_resolution(int index) {
std::string ResolutionMenu::get_string_option(int index, int action) {
sf::VideoMode mode = this->get_resolution(index);
if((mode.width == 0) && (mode.height == 0)) {
mode = sf::VideoMode::getDesktopMode();
return "System Preference (" + std::to_string(mode.width) + " x " + std::to_string(mode.height)+")";
return "System Preference (" + std::to_string(this->desktop_resolution.width) + " x " + std::to_string(this->desktop_resolution.height) + ")";
}
return std::to_string(mode.width) + " x " + std::to_string(mode.height);
}

2
source/WindowScreen_Menu.cpp
View File

@@ -793,7 +793,7 @@ void WindowScreen::setup_resolution_menu(bool reset_data) {
this->curr_menu = RESOLUTION_MENU_TYPE;
if(reset_data)
this->resolution_menu->reset_data();
this->resolution_menu->insert_data(&this->possible_resolutions);
this->resolution_menu->insert_data(&this->possible_resolutions, sf::VideoMode::getDesktopMode());
this->last_menu_change_time = std::chrono::high_resolution_clock::now();
}
}

2
source/utils.cpp
View File

@@ -13,7 +13,7 @@
#define str(a) #a
#define APP_VERSION_MAJOR 1
#define APP_VERSION_MINOR 0
#define APP_VERSION_MINOR 1
#define APP_VERSION_REVISION 0
#ifdef RASPI
#define APP_VERSION_LETTER R