Minor changes

deathkiller · Dec 4, 2024 · af643cc · af643cc
1 parent 2380776
commit af643cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Sources/Jazz2/UI/Menu/InGameMenu.cpp b/Sources/Jazz2/UI/Menu/InGameMenu.cpp
@@ -129,7 +129,7 @@ namespace Jazz2::UI::Menu
 		std::int32_t charOffset = 0;
 		std::int32_t charOffsetShadow = 0;
 
-		float titleY = _owner->_contentBounds.Y - (ViewSize.Y > 330 ? 30.0f : (ViewSize.Y >= 300 ? 50.0f : 12.0f));
+		float titleY = _owner->_contentBounds.Y - (ViewSize.Y >= 300 ? 30.0f : 12.0f);
 		float logoBaseScale = (ViewSize.Y >= 300 ? 1.0f : 0.85f);
 		float logoScale = logoBaseScale;
 		float logoTextScale = logoBaseScale;

diff --git a/Sources/Jazz2/UI/Menu/MainMenu.cpp b/Sources/Jazz2/UI/Menu/MainMenu.cpp
@@ -236,7 +236,6 @@ namespace Jazz2::UI::Menu
 		std::int32_t charOffsetShadow = 0;
 
 		float titleY = _owner->_contentBounds.Y - (ViewSize.Y >= 300 ? 30.0f : 12.0f);
-		//titleY = _owner->_contentBounds.Y - (/*ViewSize.Y > 330 ? 30.0f :*/ (ViewSize.Y >= 300 ? 50.0f : 12.0f));
 		float logoBaseScale = (ViewSize.Y >= 300 ? 1.0f : 0.85f);
 		float logoScale = logoBaseScale + (1.0f - _owner->_logoTransition) * 7.0f;
 		float logoTextScale = logoBaseScale + (1.0f - _owner->_logoTransition) * 2.0f;

diff --git a/Sources/Main.cpp b/Sources/Main.cpp
@@ -434,8 +434,9 @@ void GameEventHandler::OnResume()
 
 void GameEventHandler::OnKeyPressed(const KeyboardEvent& event)
 {
-#if defined(NCINE_HAS_WINDOWS) && !defined(DEATH_TARGET_EMSCRIPTEN)
+#if defined(NCINE_HAS_WINDOWS)
 	// Allow F11 and Alt+Enter to switch fullscreen
+	// TODO: Don't override F11 in web browser with newer version of `contrib.glfw3`
 	if (event.sym == KeySym::F11 || (event.sym == KeySym::RETURN && (event.mod & KeyMod::MASK) == KeyMod::LALT)) {
 #	if defined(DEATH_TARGET_WINDOWS_RT)
 		// Xbox is always fullscreen