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

Make crop checks happen only once

Browse Source
This commit is contained in:
Lorenzooone
2024-05-13 01:55:52 +02:00
parent 9cba3b8895
commit cb22c73dd6
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/frontend.hpp
View File

@@ -164,7 +164,7 @@ struct FrontendData {
};
bool is_allowed_crop(const CropData* crop_data, ScreenType s_type);
void insert_basic_crops(std::vector<const CropData*> &crop_vector);
void insert_basic_crops(std::vector<const CropData*> &crop_vector, ScreenType s_type);
void insert_basic_pars(std::vector<const PARData*> &par_vector);
void reset_screen_info(ScreenInfo &info);
bool load_screen_info(std::string key, std::string value, std::string base, ScreenInfo &info);

14
source/WindowScreen.cpp
View File

@@ -9,9 +9,9 @@
#define BOTTOM_ROUNDED_PADDING 5
WindowScreen::WindowScreen(ScreenType stype, CaptureStatus* capture_status, DisplayData* display_data, AudioData* audio_data, std::mutex* events_access) {
insert_basic_crops(this->possible_crops);
insert_basic_pars(this->possible_pars);
this->m_stype = stype;
insert_basic_crops(this->possible_crops, this->m_stype);
insert_basic_pars(this->possible_pars);
this->events_access = events_access;
this->m_prepare_save = 0;
this->m_prepare_load = 0;
@@ -310,11 +310,7 @@ bool WindowScreen::main_poll(SFEvent &event_data) {
case sf::Event::TextEntered:
switch(event_data.unicode) {
case 'c':
while(!done) {
this->m_info.crop_kind = (this->m_info.crop_kind + 1) % this->possible_crops.size();
if(is_allowed_crop(this->possible_crops[this->m_info.crop_kind], this->m_stype))
done = true;
}
this->m_info.crop_kind = (this->m_info.crop_kind + 1) % this->possible_crops.size();
this->print_notification("Crop: " + this->possible_crops[this->m_info.crop_kind]->name);
this->prepare_size_ratios(false, false);
this->future_operations.call_crop = true;
@@ -1316,8 +1312,6 @@ void WindowScreen::rotate() {
sf::Vector2f WindowScreen::getShownScreenSize(bool is_top, int &crop_kind) {
if(crop_kind >= this->possible_crops.size())
crop_kind = 0;
if(!is_allowed_crop(this->possible_crops[crop_kind], this->m_stype))
crop_kind = 0;
int width = this->possible_crops[crop_kind]->top_width;
int height = this->possible_crops[crop_kind]->top_height;
if(!is_top) {
@@ -1330,8 +1324,6 @@ sf::Vector2f WindowScreen::getShownScreenSize(bool is_top, int &crop_kind) {
void WindowScreen::crop() {
if(this->loaded_info.crop_kind >= this->possible_crops.size())
this->loaded_info.crop_kind = 0;
if(!is_allowed_crop(this->possible_crops[this->loaded_info.crop_kind], this->m_stype))
this->loaded_info.crop_kind = 0;
sf::Vector2f top_screen_size = getShownScreenSize(true, this->loaded_info.crop_kind);
sf::Vector2f bot_screen_size = getShownScreenSize(false, this->loaded_info.crop_kind);

5
source/frontend.cpp
View File

@@ -134,9 +134,10 @@ bool is_allowed_crop(const CropData* crop_data, ScreenType s_type) {
return false;
}
void insert_basic_crops(std::vector<const CropData*> &crop_vector) {
void insert_basic_crops(std::vector<const CropData*> &crop_vector, ScreenType s_type) {
for(int i = 0; i < (sizeof(basic_possible_crops) / sizeof(basic_possible_crops[0])); i++) {
crop_vector.push_back(basic_possible_crops[i]);
if(is_allowed_crop(basic_possible_crops[i], s_type))
crop_vector.push_back(basic_possible_crops[i]);
}
}