UI: Fix up recent pull request merges
This commit is contained in:
parent
4665925617
commit
186f384d3c
|
|
@ -6,6 +6,7 @@ enum class EmulationState : int32_t
|
|||
Stopped,
|
||||
Starting,
|
||||
LoadingRom,
|
||||
RomLoaded,
|
||||
Running,
|
||||
Paused,
|
||||
Stopping,
|
||||
|
|
|
|||
|
|
@ -177,6 +177,7 @@ bool Systemloader::LoadRom(const char * fileName)
|
|||
return false;
|
||||
}
|
||||
|
||||
g_settings->SetInt(NXCoreSetting::EmulationState, (int32_t)EmulationState::RomLoaded);
|
||||
Loader::AppLoader * app_loader = impl->m_appLoader.get();
|
||||
const LoaderFileType file_type = impl->m_appLoader->GetFileType();
|
||||
if (file_type == LoaderFileType::Unknown || file_type == LoaderFileType::Error)
|
||||
|
|
|
|||
|
|
@ -625,10 +625,9 @@ void SciterMainWindow::EmulationStateChanged(const char * /*setting*/, void * us
|
|||
SciterMainWindow * impl = (SciterMainWindow *)userData;
|
||||
EmulationState state = (EmulationState)SettingsStore::GetInstance().GetInt(NXCoreSetting::EmulationState);
|
||||
|
||||
if (state == EmulationState::LoadingRom)
|
||||
if (state == EmulationState::RomLoaded)
|
||||
{
|
||||
impl->UpdateLoadingScreenDetails();
|
||||
impl->ApplyEmulationLoadingUi();
|
||||
impl->m_shownFirstFrame = false;
|
||||
impl->ShowPanel(Panel::Loading);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,9 +123,7 @@ private:
|
|||
void ResetWindowSize(uint32_t nominal_width, uint32_t nominal_height);
|
||||
#endif
|
||||
void LayoutRenderWindow();
|
||||
void UpdatePausePanel();
|
||||
void UpdateLoadingScreenDetails();
|
||||
void ApplyEmulationLoadingUi();
|
||||
void ShowPanel(Panel panel);
|
||||
void RefreshDiskCacheLoadingText();
|
||||
void RegisterApplets();
|
||||
|
|
|
|||
|
|
@ -103,4 +103,5 @@ private:
|
|||
PollingInputType m_pollingType;
|
||||
uint32_t m_pollingButtonId;
|
||||
std::vector<std::pair<int, NpadStyleIndex>> index_controller_type_pairs;
|
||||
std::chrono::steady_clock::time_point m_stickUiThrottleLast;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue