Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/client/gui/Screen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Screen::Screen()
m_bRenderPointer = false;
m_lastTimeMoved = 0;
m_cursorTick = 0;
m_uiTheme = UI_UNIVERSAL;
m_uiTheme = UI_GENERIC;
}

Screen::~Screen()
Expand Down Expand Up @@ -140,8 +140,8 @@ void Screen::init(Minecraft* pMinecraft, int width, int height)

// Apply UI theme to current Screen based on user preference
UITheme userTheme = m_pMinecraft->getOptions()->getUiTheme();
// We don't bother applying the console theme automatically because this completely fucks scaling
if (m_uiTheme == UI_UNIVERSAL && userTheme != UI_CONSOLE)
// We don't bother applying the console theme automatically for generic screens because this completely fucks scaling
if (m_uiTheme == UI_UNIVERSAL || (m_uiTheme == UI_GENERIC && userTheme != UI_CONSOLE))
m_uiTheme = m_pMinecraft->getOptions()->getUiTheme();

setSize(width, height);
Expand Down
1 change: 1 addition & 0 deletions source/client/gui/screens/inventory/ContainerScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ContainerScreen::ContainerScreen(ContainerMenu* menu) :
m_topPos(0),
m_timeSlotDragged(0)
{
m_uiTheme = UI_UNIVERSAL;
m_bRenderPointer = true;
}

Expand Down
3 changes: 2 additions & 1 deletion source/client/options/Options.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ enum UITheme
UI_JAVA,
UI_CONSOLE,

UI_UNIVERSAL
UI_GENERIC, // The Screen is a Java / Pocket mix
UI_UNIVERSAL // The Screen automatically handles all UI themes
};

enum LogoType
Expand Down