add DoubleRes UI stubs, add 'Bold' to saved file name
This commit is contained in:
@@ -70,7 +70,7 @@
|
|||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
OutputFile="..\..\Program\$(ProjectName).exe"
|
OutputFile="$(ProjectName).exe"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
|
|||||||
@@ -168,6 +168,10 @@ BEGIN
|
|||||||
MENUITEM "&Italic\tCtrl+I", ID_STYLE_ITALIC
|
MENUITEM "&Italic\tCtrl+I", ID_STYLE_ITALIC
|
||||||
MENUITEM "&AntiAliased", ID_STYLE_ANTIALIASED
|
MENUITEM "&AntiAliased", ID_STYLE_ANTIALIASED
|
||||||
END
|
END
|
||||||
|
POPUP "Options"
|
||||||
|
BEGIN
|
||||||
|
MENUITEM "Double Resolution", ID_OPTIONS_DOUBLERES
|
||||||
|
END
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ BEGIN_MESSAGE_MAP(CTextureFontGeneratorDlg, CDialog)
|
|||||||
ON_COMMAND(ID_FILE_EXIT, OnFileExit)
|
ON_COMMAND(ID_FILE_EXIT, OnFileExit)
|
||||||
ON_COMMAND(ID_ACCELERATOR_ITALIC, OnStyleItalic)
|
ON_COMMAND(ID_ACCELERATOR_ITALIC, OnStyleItalic)
|
||||||
ON_COMMAND(ID_ACCELERATOR_BOLD, OnStyleBold)
|
ON_COMMAND(ID_ACCELERATOR_BOLD, OnStyleBold)
|
||||||
|
ON_COMMAND(ID_OPTIONS_DOUBLERES, &CTextureFontGeneratorDlg::OnOptionsDoubleres)
|
||||||
END_MESSAGE_MAP()
|
END_MESSAGE_MAP()
|
||||||
|
|
||||||
|
|
||||||
@@ -134,6 +135,8 @@ void CTextureFontGeneratorDlg::UpdateFont()
|
|||||||
g_pTextureFont->m_bBold = !!( pMenu->GetMenuState(ID_STYLE_BOLD, 0) & MF_CHECKED );
|
g_pTextureFont->m_bBold = !!( pMenu->GetMenuState(ID_STYLE_BOLD, 0) & MF_CHECKED );
|
||||||
g_pTextureFont->m_bItalic = !!( pMenu->GetMenuState(ID_STYLE_ITALIC, 0) & MF_CHECKED );
|
g_pTextureFont->m_bItalic = !!( pMenu->GetMenuState(ID_STYLE_ITALIC, 0) & MF_CHECKED );
|
||||||
g_pTextureFont->m_bAntiAlias = !!( pMenu->GetMenuState(ID_STYLE_ANTIALIASED, 0) & MF_CHECKED );
|
g_pTextureFont->m_bAntiAlias = !!( pMenu->GetMenuState(ID_STYLE_ANTIALIASED, 0) & MF_CHECKED );
|
||||||
|
if( !!( pMenu->GetMenuState(ID_OPTIONS_DOUBLERES, 0) & MF_CHECKED ) )
|
||||||
|
g_pTextureFont->m_fFontSizePixels *= 2;
|
||||||
|
|
||||||
g_pTextureFont->m_PagesToGenerate.clear();
|
g_pTextureFont->m_PagesToGenerate.clear();
|
||||||
FontPageDescription desc;
|
FontPageDescription desc;
|
||||||
@@ -499,6 +502,16 @@ void CTextureFontGeneratorDlg::OnStyleItalic()
|
|||||||
Invalidate( FALSE );
|
Invalidate( FALSE );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CTextureFontGeneratorDlg::OnOptionsDoubleres()
|
||||||
|
{
|
||||||
|
CMenu *pMenu = GetMenu();
|
||||||
|
int Checked = pMenu->GetMenuState(ID_OPTIONS_DOUBLERES, 0) & MF_CHECKED;
|
||||||
|
Checked ^= MF_CHECKED;
|
||||||
|
pMenu->CheckMenuItem( ID_OPTIONS_DOUBLERES, Checked );
|
||||||
|
m_bUpdateFontNeeded = true;
|
||||||
|
Invalidate( FALSE );
|
||||||
|
}
|
||||||
|
|
||||||
void CTextureFontGeneratorDlg::OnDeltaposSpinTop(NMHDR *pNMHDR, LRESULT *pResult)
|
void CTextureFontGeneratorDlg::OnDeltaposSpinTop(NMHDR *pNMHDR, LRESULT *pResult)
|
||||||
{
|
{
|
||||||
LPNMUPDOWN pNMUpDown = reinterpret_cast<LPNMUPDOWN>(pNMHDR);
|
LPNMUPDOWN pNMUpDown = reinterpret_cast<LPNMUPDOWN>(pNMHDR);
|
||||||
@@ -531,7 +544,10 @@ void CTextureFontGeneratorDlg::OnFileSave()
|
|||||||
{
|
{
|
||||||
CString sName = g_pTextureFont->m_sFamily;
|
CString sName = g_pTextureFont->m_sFamily;
|
||||||
sName.MakeLower();
|
sName.MakeLower();
|
||||||
_snprintf( szFile, 1023, "_%s %gpx", (const char *) sName, g_pTextureFont->m_fFontSizePixels );
|
_snprintf( szFile, 1023, "_%s%s %gpx",
|
||||||
|
(const char *) sName,
|
||||||
|
g_pTextureFont->m_bBold ? " Bold" : "",
|
||||||
|
g_pTextureFont->m_fFontSizePixels );
|
||||||
}
|
}
|
||||||
ofn.nMaxFile = sizeof(szFile);
|
ofn.nMaxFile = sizeof(szFile);
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ public:
|
|||||||
CSpinButtonCtrl m_SpinTop;
|
CSpinButtonCtrl m_SpinTop;
|
||||||
CSpinButtonCtrl m_SpinBaseline;
|
CSpinButtonCtrl m_SpinBaseline;
|
||||||
CStatic m_FontType;
|
CStatic m_FontType;
|
||||||
|
afx_msg void OnOptionsDoubleres();
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -28,13 +28,16 @@
|
|||||||
#define IDC_CHECK1 1026
|
#define IDC_CHECK1 1026
|
||||||
#define ID_ACCELERATOR_ITALIC 32773
|
#define ID_ACCELERATOR_ITALIC 32773
|
||||||
#define ID_ACCELERATOR_BOLD 32774
|
#define ID_ACCELERATOR_BOLD 32774
|
||||||
|
#define ID_OPTIONS_DOUBLERESOLUTION 32779
|
||||||
|
#define ID_OPTIONS_DOUBLERES 32780
|
||||||
|
#define IDC_OPTIONS_DOUBLERES 32781
|
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
//
|
//
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||||
#define _APS_NEXT_RESOURCE_VALUE 145
|
#define _APS_NEXT_RESOURCE_VALUE 145
|
||||||
#define _APS_NEXT_COMMAND_VALUE 32779
|
#define _APS_NEXT_COMMAND_VALUE 32782
|
||||||
#define _APS_NEXT_CONTROL_VALUE 1028
|
#define _APS_NEXT_CONTROL_VALUE 1028
|
||||||
#define _APS_NEXT_SYMED_VALUE 101
|
#define _APS_NEXT_SYMED_VALUE 101
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user