Make memory viewer and register list use the configurable font size

This commit is contained in:
Kingcom 2013-07-10 11:10:08 +02:00
parent 0eeebf5221
commit f9f9429980
2 changed files with 15 additions and 9 deletions

View file

@ -5,6 +5,7 @@
#include "../../globals.h" #include "../../globals.h"
#include "Core/Config.h"
#include "../resource.h" #include "../resource.h"
#include "../../Core/MemMap.h" #include "../../Core/MemMap.h"
#include "../W32Util/Misc.h" #include "../W32Util/Misc.h"
@ -24,14 +25,17 @@ CtrlMemView::CtrlMemView(HWND _wnd)
SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG)this); SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG)this);
SetWindowLong(wnd, GWL_STYLE, GetWindowLong(wnd,GWL_STYLE) | WS_VSCROLL); SetWindowLong(wnd, GWL_STYLE, GetWindowLong(wnd,GWL_STYLE) | WS_VSCROLL);
SetScrollRange(wnd, SB_VERT, -1,1,TRUE); SetScrollRange(wnd, SB_VERT, -1,1,TRUE);
rowHeight = g_Config.iFontHeight;
charWidth = g_Config.iFontWidth;
font = font =
CreateFont(12,8,0,0,FW_DONTCARE,FALSE,FALSE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH, CreateFont(rowHeight,charWidth,0,0,FW_DONTCARE,FALSE,FALSE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,
"Lucida Console"); CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,"Lucida Console");
underlineFont = underlineFont =
CreateFont(12,8,0,0,FW_DONTCARE,FALSE,TRUE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH, CreateFont(rowHeight,charWidth,0,0,FW_DONTCARE,FALSE,TRUE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,
"Lucida Console"); CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,"Lucida Console");
curAddress=0; curAddress=0;
rowHeight=12;
mode=MV_NORMAL; mode=MV_NORMAL;
debugger = 0; debugger = 0;
@ -41,7 +45,6 @@ CtrlMemView::CtrlMemView(HWND _wnd)
asciiSelected = false; asciiSelected = false;
selectedNibble = 0; selectedNibble = 0;
charWidth = 8;
rowSize = 16; rowSize = 16;
addressStart = charWidth; addressStart = charWidth;
hexStart = addressStart + 9*charWidth; hexStart = addressStart + 9*charWidth;

View file

@ -11,6 +11,7 @@
#include "CtrlRegisterList.h" #include "CtrlRegisterList.h"
#include "Debugger_MemoryDlg.h" #include "Debugger_MemoryDlg.h"
#include "Core/Config.h"
#include "../../globals.h" #include "../../globals.h"
#include "Debugger_Disasm.h" #include "Debugger_Disasm.h"
#include "DebuggerShared.h" #include "DebuggerShared.h"
@ -127,9 +128,11 @@ CtrlRegisterList::CtrlRegisterList(HWND _wnd)
SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)this); SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR)this);
//SetWindowLong(wnd, GWL_STYLE, GetWindowLong(wnd,GWL_STYLE) | WS_VSCROLL); //SetWindowLong(wnd, GWL_STYLE, GetWindowLong(wnd,GWL_STYLE) | WS_VSCROLL);
//SetScrollRange(wnd, SB_VERT, -1,1,TRUE); //SetScrollRange(wnd, SB_VERT, -1,1,TRUE);
font = CreateFont(12,0,0,0,FW_DONTCARE,FALSE,FALSE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,DEFAULT_PITCH,
"Lucida Console"); rowHeight=g_Config.iFontHeight;
rowHeight=12;
font = CreateFont(rowHeight,g_Config.iFontWidth,0,0,FW_DONTCARE,FALSE,FALSE,FALSE,DEFAULT_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY,DEFAULT_PITCH,"Lucida Console");
selecting=false; selecting=false;
selection=0; selection=0;
category=0; category=0;