libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 03:10:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Add flag to enforce mac font in win95 mode

Browse Source
This commit is contained in:
Avijeet 2022-07-06 21:55:05 +05:30 committed by Eugene Sandulenko
parent fae3232d89
commit cd985e2a7f
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/macgui/macmenu.cpp
View File

@ -127,7 +127,7 @@ MacMenu::MacMenu(int id, const Common::Rect &bounds, MacWindowManager *wm)
_dimensionsDirty = true;
if (_wm->_mode & kWMModeWin95) {
if (_wm->_mode & kWMModeWin95 && !(_wm->_mode & kWMModeForceMacFontsInWin95)) {
_menuDropdownItemHeight = kMenuWin95DropdownItemHeight;
_menuLeftDropdownPadding = kMenuWin95LeftDropdownPadding;
_menuRightDropdownPadding = kMenuWin95RightDropdownPadding;
@ -722,7 +722,7 @@ void MacMenu::createSubMenuFromString(int id, const char *str, int commandId) {
const Font *MacMenu::getMenuFont(int slant) {
#ifdef USE_FREETYPE2
if (_wm->_mode & kWMModeWin95) {
if (_wm->_mode & kWMModeWin95 && !(_wm->_mode & kWMModeForceMacFontsInWin95)) {
if (!_loadedFont) {
_loadedFont = Graphics::loadTTFFontFromArchive("ms_sans_serif.ttf", 16);

25
graphics/macgui/macwindowmanager.h
View File

@ -76,18 +76,19 @@ enum MacCursorType {
};
enum {
kWMModeNone = 0,
kWMModeNoDesktop = (1 << 0),
kWMModeAutohideMenu = (1 << 1),
kWMModalMenuMode = (1 << 2),
kWMModeForceBuiltinFonts= (1 << 3),
kWMModeUnicode = (1 << 4),
kWMModeManualDrawWidgets= (1 << 5),
kWMModeFullscreen = (1 << 6),
kWMModeButtonDialogStyle= (1 << 7),
kWMMode32bpp = (1 << 8),
kWMNoScummVMWallpaper = (1 << 9),
kWMModeWin95 = (1 << 10)
kWMModeNone = 0,
kWMModeNoDesktop = (1 << 0),
kWMModeAutohideMenu = (1 << 1),
kWMModalMenuMode = (1 << 2),
kWMModeForceBuiltinFonts = (1 << 3),
kWMModeUnicode = (1 << 4),
kWMModeManualDrawWidgets = (1 << 5),
kWMModeFullscreen = (1 << 6),
kWMModeButtonDialogStyle = (1 << 7),
kWMMode32bpp = (1 << 8),
kWMNoScummVMWallpaper = (1 << 9),
kWMModeWin95 = (1 << 10),
kWMModeForceMacFontsInWin95 = (1 << 11) // Enforce Mac font for languages which don't have glyphs in ms_sans_serif.ttf
};
}