vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix up keyboard tooltips

Browse Source
This commit is contained in:
Fireblade
2026-07-20 17:23:25 -04:00
parent cd64f5f52b
commit ca6e3585d0
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/UI/UIComponent_Tooltips.cpp
+2 -2
View File
@@ -142,8 +142,8 @@ void UIComponent_Tooltips::updateSafeZone()
const F64 screenW = ui.getScreenWidth();
const F64 screenH = ui.getScreenHeight();
const bool largerThan720Window = (screenH > 720.0f) || (screenW > 1280.0f);
const bool menuContext = ui.GetMenuDisplayed(m_iPad);
if(getSceneResolution() == eSceneResolution_720 && largerThan720Window && menuContext)
// const bool menuContext = ui.GetMenuDisplayed(m_iPad);
if(getSceneResolution() == eSceneResolution_720 && largerThan720Window /*&& menuContext*/)
{
const F64 widthScale = screenW / 1920.0f;
const F64 heightScale = screenH / 1080.0f;
Minecraft.Client/Common/UI/UIController.cpp
+1
View File
@@ -226,6 +226,7 @@ static wstring GetControlTypeSkinPath(int controlType, bool hd)
{
return wstring(L"Graphics\\ControlType\\HD\\") + skinName + L"HD.swf";
}
return wstring(L"Graphics\\ControlType\\") + skinName + L".swf";
}
#endif
Minecraft.Client/Common/UI/UIScene.cpp
+10 -8
View File
@@ -18,16 +18,10 @@ bool UIScene::SceneShouldUse1080p(const std::wstring &moviePath)
if(primaryPad < 0 || primaryPad >= XUSER_MAX_COUNT)
primaryPad = 0;
const int controlType = app.GetGameSettings(primaryPad, eGameSetting_ControlType);
const bool force1080ForControlType = (controlType == 0);
const bool force720ForControlType = (controlType == 3 || controlType == 5);
const bool isTutorialPopupMovie = (moviePath.find(L"TutorialPopup") == 0);
// dont refresh gui elements when the player
// is in the settings menu [resolution mismatch creates artifacts]
if(moviePath.find(L"SettingsUIMenu") == 0)
{
return (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
}
Minecraft *pMinecraft = Minecraft::GetInstance();
TexturePack *selectedPack = nullptr;
if(pMinecraft && pMinecraft->skins)
@@ -35,7 +29,15 @@ bool UIScene::SceneShouldUse1080p(const std::wstring &moviePath)
selectedPack = pMinecraft->skins->getSelected();
}
const bool isMarioWorld = (selectedPack && selectedPack->getId() == 1034);
return !isMarioWorld && (ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
// dont refresh gui elements when the player
// is in the settings menu [resolution mismatch creates artifacts]
if(moviePath.find(L"SettingsUIMenu") == 0)
{
return !isMarioWorld && (force1080ForControlType || ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
}
return !isMarioWorld && (force1080ForControlType || ui.getScreenHeight() > 720.0f) && (!force720ForControlType || isTutorialPopupMovie);
#else
(void)moviePath;
return true;