github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 22:02:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

theide: non-fixed pitch fonts allowed in editor (as fixed...)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1255 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-06-01 07:19:34 +00:00
parent e5a9d0dd6f
commit 5bcb672b15
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
uppsrc/ide/Setup.cpp
View file

@ -43,6 +43,18 @@ void FontSelectManager::Select() {
WhenAction();
}
void LoadFonts(DropList *face, Index<String>& fni, bool fixed)
{
for(int i = 0; i < Font::GetFaceCount(); i++)
if(!!(Font::GetFaceInfo(i) & Font::FIXEDPITCH) == fixed) {
String n = Font::GetFaceName(i);
if(fni.Find(n) < 0) {
fni.Add(n);
face->Add(i, n);
}
}
}
void FontSelectManager::Set(DropList& _face, DropList& _height,
Option& _bold, Option& _italic, Option& _naa) {
face = &_face;
@ -56,11 +68,10 @@ void FontSelectManager::Set(DropList& _face, DropList& _height,
naa = &_naa;
naa->WhenAction = THISBACK(Select);
face->Clear();
for(int i = 0; i < Font::GetFaceCount(); i++)
if(Font::GetFaceInfo(i) & Font::FIXEDPITCH) {
face->Add(i, Font::GetFaceName(i));
LLOG("Face: " << Font::GetFaceName(i));
}
Index<String> fni;
LoadFonts(face, fni, true);
face->AddSeparator();
LoadFonts(face, fni, false);
face->SetIndex(0);
height->ClearList();
for(int i = 6; i < 32; i++)
@ -69,7 +80,15 @@ void FontSelectManager::Set(DropList& _face, DropList& _height,
}
void FontSelectManager::Set(Font f) {
face->SetData(f.GetFace());
int fi = f.GetFace();
if(!face->HasKey(fi)) {
fi = face->FindValue(f.GetFaceName());
if(fi < 0)
fi = Font::COURIER;
else
fi = face->GetKey(fi);
}
face->SetData(fi);
FaceSelect();
height->SetData(f.GetHeight());
for(int i = 0; i < height->GetCount(); i++) {

2
uppsrc/ide/ide.upp
View file

@ -1,4 +1,4 @@
description "TheIDE main package";
description "TheIDE main package\377";
uses
ide\Common,