mirror of
				https://git.h3cjp.net/H3cJP/citra.git
				synced 2025-11-04 09:05:08 +00:00 
			
		
		
		
	common: Move global configuration state modifiers back to settings
This commit is contained in:
		
							parent
							
								
									b02e7eea78
								
							
						
					
					
						commit
						3211623192
					
				| 
						 | 
				
			
			@ -287,4 +287,14 @@ void RestoreGlobalState(bool is_powered_on) {
 | 
			
		|||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool configuring_global = true;
 | 
			
		||||
 | 
			
		||||
bool IsConfiguringGlobal() {
 | 
			
		||||
    return configuring_global;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void SetConfiguringGlobal(bool is_global) {
 | 
			
		||||
    configuring_global = is_global;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
} // namespace Settings
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -529,4 +529,7 @@ void UpdateRescalingInfo();
 | 
			
		|||
// Restore the global state of all applicable settings in the Values struct
 | 
			
		||||
void RestoreGlobalState(bool is_powered_on);
 | 
			
		||||
 | 
			
		||||
bool IsConfiguringGlobal();
 | 
			
		||||
void SetConfiguringGlobal(bool is_global);
 | 
			
		||||
 | 
			
		||||
} // namespace Settings
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -52,14 +52,4 @@ const std::string& BasicSetting::GetLabel() const {
 | 
			
		|||
    return label;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool configuring_global = true;
 | 
			
		||||
 | 
			
		||||
bool IsConfiguringGlobal() {
 | 
			
		||||
    return configuring_global;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void SetConfiguringGlobal(bool is_global) {
 | 
			
		||||
    configuring_global = is_global;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
} // namespace Settings
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,9 +60,6 @@ enum Specialization : u8 {
 | 
			
		|||
    Percentage = (1 << SpecializationAttributeOffset),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
bool IsConfiguringGlobal();
 | 
			
		||||
void SetConfiguringGlobal(bool is_global);
 | 
			
		||||
 | 
			
		||||
class BasicSetting;
 | 
			
		||||
 | 
			
		||||
class Linkage {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -39,6 +39,7 @@
 | 
			
		|||
#include "common/assert.h"
 | 
			
		||||
#include "common/common_types.h"
 | 
			
		||||
#include "common/logging/log.h"
 | 
			
		||||
#include "common/settings.h"
 | 
			
		||||
#include "common/settings_common.h"
 | 
			
		||||
#include "yuzu/configuration/shared_translation.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue