github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Oxygen KDE theme fixed #779

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8194 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-02-23 09:54:33 +00:00
commit fed3d83480
7 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/CtrlLib/ChGtk.cpp
View file

@ -10,6 +10,14 @@
NAMESPACE_UPP
#define IMAGECLASS AmbientCtrlsImg
#define IMAGEFILE <CtrlLib/AmbientCtrls.iml>
#include <Draw/iml_header.h>
#define IMAGECLASS AmbientCtrlsImg
#define IMAGEFILE <CtrlLib/AmbientCtrls.iml>
#include <Draw/iml_source.h>
extern int gtk_antialias;
extern int gtk_hinting;
extern String gtk_hintstyle;
@ -145,6 +153,10 @@ void ChHostSkin()
ColoredOverride(CtrlsImg::Iml(), CtrlsImg::Iml());
int classiq = engine == "Redmond" || engine == "Raleigh" || engine == "Glider" || engine == "Simple";
if(!classiq)
ColoredOverride(CtrlsImg::Iml(), AmbientCtrlsImg::Iml());
Color fc = Blend(SColorHighlight, SColorShadow);
ChGtkIs().Clear();
@ -182,9 +194,7 @@ void ChHostSkin()
}
Point po(0, 0);
int classiq = engine == "Redmond" || engine == "Raleigh" || engine == "Glider" || engine == "Simple";
{
Button::Style& s = Button::StyleNormal().Write();
s.overpaint = 3;
@ -474,6 +484,7 @@ void ChHostSkin()
}
int efm = 0;
if(engine.Find("oxygen") < 0)
{
EditField::Style& s = EditField::StyleDefault().Write();
Image img;
@ -512,6 +523,7 @@ void ChHostSkin()
s.sep2 = SColorShadow();
s.sep1 = SColorLight();
s.sepm = 4;
if(engine.Find("oxygen") < 0)
{
MultiButton::Style& s = MultiButton::StyleFrame().Write();
for(int i = 0; i < 4; i++)