UI: Disable render dup frames where it can't work.

Fixes hrydgard#12724.
unknownbrackets · Mar 22, 2020 · 3b05e83 · 3b05e83
1 parent 0d2acb6
commit 3b05e83
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -344,6 +344,9 @@ void GameSettingsScreen::CreateViews() {
 	});
 #endif
 	CheckBox *frameDuplication = graphicsSettings->Add(new CheckBox(&g_Config.bRenderDuplicateFrames, gr->T("Render duplicate frames to 60hz")));
+	frameDuplication->SetEnabledFunc([] {
+		return g_Config.iRenderingMode != FB_NON_BUFFERED_MODE || (g_Config.bSoftwareRendering && g_Config.iFrameSkip != 0);
+	});
 	frameDuplication->OnClick.Add([=](EventParams &e) {
 		settingInfo_->Show(gr->T("RenderDuplicateFrames Tip", "Can make framerate smoother in games that run at lower framerates"), e.v);
 		return UI::EVENT_CONTINUE;

diff --git a/ext/native/ui/view.h b/ext/native/ui/view.h
@@ -401,15 +401,34 @@ class View {
 		return GetFocusedView() == this;
 	}
 
-	void SetEnabled(bool enabled) { enabled_ = enabled; enabledMeansDisabled_ = false; }
+	void SetEnabled(bool enabled) {
+		enabledFunc_ = nullptr;
+		enabledPtr_ = nullptr;
+		enabled_ = enabled;
+		enabledMeansDisabled_ = false;
+	}
 	bool IsEnabled() const {
+		if (enabledFunc_)
+			return enabledFunc_() != enabledMeansDisabled_;
 		if (enabledPtr_)
 			return *enabledPtr_ != enabledMeansDisabled_;
-		else
-			return enabled_ != enabledMeansDisabled_;
+		return enabled_ != enabledMeansDisabled_;
+	}
+	void SetEnabledFunc(std::function<bool()> func) {
+		enabledFunc_ = func;
+		enabledPtr_ = nullptr;
+		enabledMeansDisabled_ = false;
+	}
+	void SetEnabledPtr(bool *enabled) {
+		enabledFunc_ = nullptr;
+		enabledPtr_ = enabled;
+		enabledMeansDisabled_ = false;
+	}
+	void SetDisabledPtr(bool *disabled) {
+		enabledFunc_ = nullptr;
+		enabledPtr_ = disabled;
+		enabledMeansDisabled_ = true;
 	}
-	void SetEnabledPtr(bool *enabled) { enabledPtr_ = enabled; enabledMeansDisabled_ = false; }
-	void SetDisabledPtr(bool *disabled) { enabledPtr_ = disabled; enabledMeansDisabled_ = true;  }
 
 	virtual void SetVisibility(Visibility visibility) { visibility_ = visibility; }
 	Visibility GetVisibility() const { return visibility_; }
@@ -445,6 +464,7 @@ class View {
 	std::vector<Tween *> tweens_;
 
 private:
+	std::function<bool()> enabledFunc_;
 	bool *enabledPtr_;
 	bool enabled_;
 	bool enabledMeansDisabled_;