Official Release 1.1.0

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

View File

@ -35,10 +35,16 @@ jobs:
shell: bash
run: cmake -S . -B build -DCMAKE_INSTALL_PREFIX=install ${{matrix.platform.flags}} ${{matrix.config.flags}}
- name: Build
- name: Build Windows
if: runner.os == 'Windows'
shell: bash
run: cmake --build build --config Release
- name: Build (not Windows)
if: runner.os != 'Windows'
shell: bash
run: cmake --build build --config Release -j
- name: Pack
shell: bash
run: cd build && cpack -G ZIP

View File

@ -30,14 +30,30 @@ jobs:
shell: bash
run: cmake -S . -B build -DCMAKE_INSTALL_PREFIX=install ${{matrix.platform.flags}} ${{matrix.config.flags}}
- name: Build
- name: Build Windows
if: runner.os == 'Windows'
shell: bash
run: cmake --build build --config Release
- name: Build (not Windows)
if: runner.os != 'Windows'
shell: bash
run: cmake --build build --config Release -j
- name: Pack
shell: bash
run: cd build && cpack -G ZIP
- name: Unpack Codesign Repack x64
if: (runner.os == 'macOS') && (runner.arch == 'x64')
shell: bash
run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_x86_64
- name: Unpack Codesign Repack Arm64
if: (runner.os == 'macOS') && (runner.arch == 'ARM64')
shell: bash
run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_arm64
- name: Archive resulting artifact
uses: actions/upload-artifact@v3
with:

View File

@ -141,5 +141,4 @@ On Windows, the profiles can be found in the ".config/cc3dsfs" folder inside the
```
frequency = 96000
periods = 2
period_size = 64
```

View File

@ -16,7 +16,7 @@ public:
ResolutionMenu(bool font_load_success, sf::Font &text_font);
~ResolutionMenu();
void prepare(float scaling_factor, int view_size_x, int view_size_y, int fullscreen_mode_width, int fullscreen_mode_height);
void insert_data(std::vector<sf::VideoMode>* possible_resolutions);
void insert_data(std::vector<sf::VideoMode>* possible_resolutions, const sf::VideoMode &desktop_resolution);
int selected_index = RESOLUTION_MENU_NO_ACTION;
void reset_output_option();
protected:
@ -27,5 +27,6 @@ protected:
private:
std::vector<sf::VideoMode>* possible_resolutions;
sf::VideoMode get_resolution(int index);
sf::VideoMode desktop_resolution;
};
#endif

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);
}

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();
}
}

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