root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :
Corretta visualizzazione testi nei campi.
Ora il trattino in fondo alla "g" e' visibile e non sembra piu' una "q"


git-svn-id: svn://10.65.10.50/trunk@18133 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-01-28 09:06:23 +00:00
parent 425181151b
commit cc7fa2ba69
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xvaga/xvaga.cpp
View File

@ -1654,7 +1654,7 @@ void xvt_dwin_get_font_metrics(WINDOW win, int *leadingp, int *ascentp, int *des
{ {
// Attenzione: non funziona la chiamate in cascata a xvt_font_get_metrics // Attenzione: non funziona la chiamate in cascata a xvt_font_get_metrics
CAST_DC(win, dc); CAST_DC(win, dc);
const wxString str = "Mq"; const wxString str = "Mg";
int height, desc, lead; int height, desc, lead;
dc.GetTextExtent(str, NULL, &height, &desc, &lead); dc.GetTextExtent(str, NULL, &height, &desc, &lead);
if (leadingp) if (leadingp)
@ -1717,7 +1717,7 @@ BOOLEAN xvt_dwin_is_update_needed(WINDOW win, const RCT* rctp)
return TRUE; return TRUE;
CAST_WIN(win, w); // child windows and TASK_WIN CAST_WIN(win, w); // child windows and TASK_WIN
const wxRect rect1 = NormalizeRCT(rctp); const wxRect rect1 = NormalizeRCT(rctp);
const wxRect rect2 = w.GetUpdateClientRect(); // w.GetUpdateRegion().GetBox(); const wxRect rect2 = w.GetUpdateClientRect();
return RectIntersect(rect1, rect2); return RectIntersect(rect1, rect2);
} }
return FALSE; return FALSE;
@ -2043,8 +2043,8 @@ long xvt_font_serialize(XVT_FNTID font_id, char *buf, long max_buf)
const int weight = (font.Mask() & XVT_FS_BOLD) ? 700 : 400; const int weight = (font.Mask() & XVT_FS_BOLD) ? 700 : 400;
wxString str; wxString str;
str = wxString::Format("01\\%s\\0\\%d\\WIN01/%d/%d/0/0/%d/0/0/0/0/0/0/0/0/%s", str.Printf("01\\%s\\0\\%d\\WIN01/%d/%d/0/0/%d/0/0/0/0/0/0/0/0/%s",
name, size, size, weight, italic, name); name, size, size, weight, italic, name);
if (buf != NULL && max_buf > 0) if (buf != NULL && max_buf > 0)
{ {
wxStrncpy(buf, str, max_buf); wxStrncpy(buf, str, max_buf);
@ -3053,17 +3053,17 @@ MENU_ITEM* xvt_res_get_menu(int rid)
{ {
wxFileName::SplitPath(wxTheApp->argv[0], NULL, &strName, NULL); wxFileName::SplitPath(wxTheApp->argv[0], NULL, &strName, NULL);
strName.MakeUpper(); strName.MakeUpper();
strName = wxString::Format("/Menu_%s-%X", (const char *) strName.Left(3), (rid-1)%16); strName.Printf("/Menu_%s-%X", (const char *) strName.Left(3), (rid-1)%16);
} }
else else
strName = wxString::Format("/Menu_%d", rid); strName.Printf("/Menu_%d", rid);
ini.SetPath(strName); ini.SetPath(strName);
wxString strItem; wxString strItem;
for (int i = 0; i < MAX_MENU; i++) for (int i = 0; i < MAX_MENU; i++)
{ {
MENU_ITEM* mi = &TheMenu[i]; MENU_ITEM* mi = &TheMenu[i];
strItem = wxString::Format("Item_%02d", i); strItem.Printf("Item_%02d", i);
if (ini.Read(strItem, &strName)) if (ini.Read(strItem, &strName))
{ {
FillMenuItem(strName, mi); FillMenuItem(strName, mi);
@ -3071,7 +3071,7 @@ MENU_ITEM* xvt_res_get_menu(int rid)
for (int j = 0; j < MAX_MENU; j++, mi++) for (int j = 0; j < MAX_MENU; j++, mi++)
{ {
strItem = wxString::Format("Item_%02d_%02d", i, j); strItem.Printf("Item_%02d_%02d", i, j);
if (ini.Read(strItem, &strName)) if (ini.Read(strItem, &strName))
FillMenuItem(strName, mi); FillMenuItem(strName, mi);
else else

4
xvaga/xvtwin.cpp
View File

@ -332,8 +332,8 @@ wxDC& TDC::GetDC(bool bPaint)
_real_font = _font; _real_font = _font;
int height, desc, lead; int height, desc, lead;
_dc->GetTextExtent("Campo", NULL, &height, &desc, &lead); _dc->GetTextExtent("Mg", NULL, &height, &desc, &lead);
_deltaf = height-desc; _deltaf = height-desc+1;
} }
if (_dirty < 0 || ClipChanged()) if (_dirty < 0 || ClipChanged())