Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22134 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-11-10 01:55:12
|
Author: sagamusix Date: Sun Nov 10 02:54:59 2024 New Revision: 22134 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22134 Log: [Imp] Built-in pattern font is now automatically scaled according to DPI settings. From 150% onwards it is upscaled 2x, from 250% onwards it's 3x, etc... Modified: trunk/OpenMPT/mptrack/PatternFont.cpp Modified: trunk/OpenMPT/mptrack/PatternFont.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternFont.cpp Sun Nov 10 02:01:15 2024 (r22133) +++ trunk/OpenMPT/mptrack/PatternFont.cpp Sun Nov 10 02:54:59 2024 (r22134) @@ -120,6 +120,7 @@ void PatternFont::UpdateFont(HWND hwnd) { + const int dpi = HighDPISupport::GetDpiForWindow(hwnd); FontSetting font = TrackerSettings::Instance().patternFont; const PATTERNFONT *builtinFont = nullptr; if(font.name == PATTERNFONT_SMALL || font.name.empty()) @@ -130,7 +131,8 @@ builtinFont = &gDefaultPatternFont; } - if(builtinFont != nullptr && font.size < 1) + const int builtInFontSize = Util::muldivr(std::min(font.size + 1, 11), dpi, 96); + if(builtinFont != nullptr && builtInFontSize < 2) { currentFont = builtinFont; return; @@ -141,7 +143,6 @@ static FontSetting previousFont; static int previousDPI = 0; - const int dpi = HighDPISupport::GetDpiForWindow(hwnd); if(previousFont == font && previousDPI == dpi) { // Nothing to do @@ -157,18 +158,16 @@ if(builtinFont != nullptr) { // Copy and scale original 4-bit bitmap - LimitMax(font.size, 10); - font.size++; customFontBitmap.bmiHeader = CMainFrame::bmpNotes->bmiHeader; - customFontBitmap.bmiHeader.biWidth *= font.size; - customFontBitmap.bmiHeader.biHeight *= font.size; + customFontBitmap.bmiHeader.biWidth *= builtInFontSize; + customFontBitmap.bmiHeader.biHeight *= builtInFontSize; customFontBitmap.bmiHeader.biSizeImage = customFontBitmap.bmiHeader.biWidth * customFontBitmap.bmiHeader.biHeight / 2; customFontBitmap.lpDibBits = new uint8[customFontBitmap.bmiHeader.biSizeImage]; // Upscale the image (ugly code ahead) const uint8 *origPixels = CMainFrame::bmpNotes->lpDibBits; uint8 *scaledPixels = customFontBitmap.lpDibBits; - const int bytesPerLine = customFontBitmap.bmiHeader.biWidth / 2, scaleBytes = bytesPerLine * font.size; + const int bytesPerLine = customFontBitmap.bmiHeader.biWidth / 2, scaleBytes = bytesPerLine * builtInFontSize; bool outPos = false; for(int y = 0; y < CMainFrame::bmpNotes->bmiHeader.biHeight; y++, scaledPixels += scaleBytes - bytesPerLine) { @@ -183,7 +182,7 @@ pixel &= 0x0F; origPixels++; } - for(int scaleX = 0; scaleX < font.size; scaleX++) + for(int scaleX = 0; scaleX < builtInFontSize; scaleX++) { if(!outPos) { @@ -203,43 +202,43 @@ } } } - pf.nWidth = (builtinFont->nWidth - 4) * font.size + 4; - pf.nHeight = builtinFont->nHeight * font.size; - pf.nClrX = builtinFont->nClrX * font.size; - pf.nClrY = builtinFont->nClrY * font.size; - pf.nSpaceX = builtinFont->nSpaceX * font.size; - pf.nSpaceY = builtinFont->nSpaceY * font.size; + pf.nWidth = (builtinFont->nWidth - 4) * builtInFontSize + 4; + pf.nHeight = builtinFont->nHeight * builtInFontSize; + pf.nClrX = builtinFont->nClrX * builtInFontSize; + pf.nClrY = builtinFont->nClrY * builtInFontSize; + pf.nSpaceX = builtinFont->nSpaceX * builtInFontSize; + pf.nSpaceY = builtinFont->nSpaceY * builtInFontSize; for(std::size_t i = 0; i < std::size(pf.nEltWidths); i++) { - pf.nEltWidths[i] = builtinFont->nEltWidths[i] * font.size; - pf.padding[i] = builtinFont->padding[i] * font.size; + pf.nEltWidths[i] = builtinFont->nEltWidths[i] * builtInFontSize; + pf.padding[i] = builtinFont->padding[i] * builtInFontSize; } - pf.nNumX = builtinFont->nNumX * font.size; - pf.nNumY = builtinFont->nNumY * font.size; - pf.nNum10X = builtinFont->nNum10X * font.size; - pf.nNum10Y = builtinFont->nNum10Y * font.size; - pf.nAlphaAM_X = builtinFont->nAlphaAM_X * font.size; - pf.nAlphaAM_Y = builtinFont->nAlphaAM_Y * font.size; - pf.nAlphaNZ_X = builtinFont->nAlphaNZ_X * font.size; - pf.nAlphaNZ_Y = builtinFont->nAlphaNZ_Y * font.size; - pf.nNoteX = builtinFont->nNoteX * font.size; - pf.nNoteY = builtinFont->nNoteY * font.size; - pf.nNoteWidth[0] = builtinFont->nNoteWidth[0] * font.size; - pf.nNoteWidth[1] = builtinFont->nNoteWidth[1] * font.size; - pf.nOctaveWidth = builtinFont->nOctaveWidth * font.size; - pf.nVolX = builtinFont->nVolX * font.size; - pf.nVolY = builtinFont->nVolY * font.size; - pf.nVolCmdWidth = builtinFont->nVolCmdWidth * font.size; - pf.nVolHiWidth = builtinFont->nVolHiWidth * font.size; - pf.nCmdOfs = builtinFont->nCmdOfs * font.size; - pf.nParamHiWidth = builtinFont->nParamHiWidth * font.size; - pf.nInstrOfs = builtinFont->nInstrOfs * font.size; - pf.nInstr10Ofs = builtinFont->nInstr10Ofs * font.size; - pf.nInstrHiWidth = builtinFont->nInstrHiWidth * font.size; - pf.pcParamMargin = builtinFont->pcParamMargin * font.size; - pf.pcValMargin = builtinFont->pcValMargin * font.size; - pf.paramLoMargin = builtinFont->paramLoMargin * font.size; - pf.spacingY = builtinFont->spacingY * font.size; + pf.nNumX = builtinFont->nNumX * builtInFontSize; + pf.nNumY = builtinFont->nNumY * builtInFontSize; + pf.nNum10X = builtinFont->nNum10X * builtInFontSize; + pf.nNum10Y = builtinFont->nNum10Y * builtInFontSize; + pf.nAlphaAM_X = builtinFont->nAlphaAM_X * builtInFontSize; + pf.nAlphaAM_Y = builtinFont->nAlphaAM_Y * builtInFontSize; + pf.nAlphaNZ_X = builtinFont->nAlphaNZ_X * builtInFontSize; + pf.nAlphaNZ_Y = builtinFont->nAlphaNZ_Y * builtInFontSize; + pf.nNoteX = builtinFont->nNoteX * builtInFontSize; + pf.nNoteY = builtinFont->nNoteY * builtInFontSize; + pf.nNoteWidth[0] = builtinFont->nNoteWidth[0] * builtInFontSize; + pf.nNoteWidth[1] = builtinFont->nNoteWidth[1] * builtInFontSize; + pf.nOctaveWidth = builtinFont->nOctaveWidth * builtInFontSize; + pf.nVolX = builtinFont->nVolX * builtInFontSize; + pf.nVolY = builtinFont->nVolY * builtInFontSize; + pf.nVolCmdWidth = builtinFont->nVolCmdWidth * builtInFontSize; + pf.nVolHiWidth = builtinFont->nVolHiWidth * builtInFontSize; + pf.nCmdOfs = builtinFont->nCmdOfs * builtInFontSize; + pf.nParamHiWidth = builtinFont->nParamHiWidth * builtInFontSize; + pf.nInstrOfs = builtinFont->nInstrOfs * builtInFontSize; + pf.nInstr10Ofs = builtinFont->nInstr10Ofs * builtInFontSize; + pf.nInstrHiWidth = builtinFont->nInstrHiWidth * builtInFontSize; + pf.pcParamMargin = builtinFont->pcParamMargin * builtInFontSize; + pf.pcValMargin = builtinFont->pcValMargin * builtInFontSize; + pf.paramLoMargin = builtinFont->paramLoMargin * builtInFontSize; + pf.spacingY = builtinFont->spacingY * builtInFontSize; // Create 4-pixel border const int bmWidth2 = pf.dib->bmiHeader.biWidth / 2; |
