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

CtrlCore: UHD/X11 fixed #1241

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8905 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-09-07 09:55:36 +00:00
parent d6ecafae9b
commit 8b35038cd1
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/DrawX11.cpp
View file

@ -215,8 +215,6 @@ void InitX11Draw(XDisplay *display)
Xgetpixel = GetPseudoColorPixel;
}
// XFree(v);
Font::SetStdFont(ScreenSans(12));
}
void InitX11Draw(const char *dispname)

2
uppsrc/CtrlCore/X11App.cpp
View file

@ -419,7 +419,7 @@ void Ctrl::InitX11(const char *display)
for(int i = 0; i < nets.GetCount(); i++)
_NET_Supported().Add(nets[i]);
SetStdFont(Arial(12));
Font::SetDefaultFont(Arial(12));
ReSkin();

4
uppsrc/CtrlLib/ChGtk.cpp
View file

@ -111,7 +111,7 @@ void ChHostSkin()
// gtk_hintstyle = GtkStyleString("gtk-xft-hintstyle");
gtk_hintstyle = gtk_hinting? "hintfull" : "hintnone"; // Gtk does not seem to follow its own rules...
gtk_rgba = GtkStyleString("gtk-xft-rgba");
const char *q = strrchr(font_name, ' ');
if(q) {
int h = atoi(q);
@ -149,7 +149,7 @@ void ChHostSkin()
}
}
}
Font::SetDefaultFont(Font(fontname, fround(fontheight * xdpi + 512*72.0) / (1024*72))
.Bold(bold).Italic(italic));

1
uppsrc/Draw/Font.cpp
View file

@ -152,6 +152,7 @@ bool Font::std_font_override;
void Font::SetDefaultFont(Font font)
{
LLOG("SetDefaultFont " << font);
if(!std_font_override)
SetStdFont0(font);
}