mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-15 06:05:58 -06:00
Merge branch 'master' of https://github.com/ultimatepp/ultimatepp
This commit is contained in:
commit
453784adab
1 changed files with 4 additions and 3 deletions
|
|
@ -5,6 +5,7 @@
|
||||||
namespace Upp {
|
namespace Upp {
|
||||||
|
|
||||||
#define LLOG(x)
|
#define LLOG(x)
|
||||||
|
#define LDUMP(x)
|
||||||
|
|
||||||
VectorMap<String, Value> GetXSettings()
|
VectorMap<String, Value> GetXSettings()
|
||||||
{
|
{
|
||||||
|
|
@ -96,15 +97,15 @@ void ChHostSkin()
|
||||||
String theme = map.Get("Net/ThemeName", "");
|
String theme = map.Get("Net/ThemeName", "");
|
||||||
//int scaling = map.Get("Gdk/WindowScalingFactor", 1);
|
//int scaling = map.Get("Gdk/WindowScalingFactor", 1);
|
||||||
int xdpi = map.Get("Xft/DPI", 98347);
|
int xdpi = map.Get("Xft/DPI", 98347);
|
||||||
|
|
||||||
int fontface = Font::ARIAL;
|
int fontface = Font::ARIAL;
|
||||||
int fontheight = 13;
|
double fontheight = 12;
|
||||||
bool bold = false;
|
bool bold = false;
|
||||||
bool italic = false;
|
bool italic = false;
|
||||||
|
|
||||||
const char *q = strrchr(font_name, ' ');
|
const char *q = strrchr(font_name, ' ');
|
||||||
if(q) {
|
if(q) {
|
||||||
int h = atoi(q);
|
double h = Atof(q);
|
||||||
if(h)
|
if(h)
|
||||||
fontheight = h;
|
fontheight = h;
|
||||||
String face(font_name, q);
|
String face(font_name, q);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue