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

CtrlLib: ToolBar images not longer adjusted for dark theme, plugin/pcre: Fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12880 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-03-23 09:54:12 +00:00
parent d98997c227
commit 97cbae192c
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlLib/MenuItem.cpp
View file

@ -210,8 +210,6 @@ void MenuItemBase::PaintTopItem(Draw& w, int state) {
Bar::Item& MenuItem::Image(const UPP::Image& img)
{
licon = img;
if(IsDarkColorFace() && !nodarkadjust)
licon = MakeImage(licon, AdjustForDarkBk);
Refresh();
return *this;
}
@ -219,8 +217,6 @@ Bar::Item& MenuItem::Image(const UPP::Image& img)
MenuItem& MenuItem::RightImage(const UPP::Image& img)
{
ricon = img;
if(IsDarkColorFace() && !nodarkadjust)
ricon = MakeImage(ricon, AdjustForDarkBk);
Refresh();
return *this;
}

8
uppsrc/CtrlLib/ToolButton.cpp
View file

@ -162,11 +162,7 @@ ToolButton& ToolButton::Kind(int _kind)
Image ToolButton::GetImage() const
{
UPP::Image m = img;
if(IsDarkColorFace() && !nodarkadjust)
m = MakeImage(m, AdjustForDarkBk);
m = CachedRescale(m, min(m.GetSize(), maxiconsize));
return m;
return CachedRescale(img, min(m.GetSize(), maxiconsize));
}
Bar::Item& ToolButton::Image(const UPP::Image& img_)
@ -268,6 +264,8 @@ void ToolButton::Paint(Draw& w)
w.DrawText(ip.x + isz.cx + 3 + off.x, (sz.cy - tsz.cy) / 2 + off.y, text, style->font, style->textcolor[li]);
}
UPP::Image img = CachedContrast(image, style->contrast[li]);
DDUMP(style->contrast);
_DBG_; img = image;
if(!IsEnabled())
img = DisabledImage(img);
if(IsEnabled() && style->light[li])

2
uppsrc/plugin/pcre/lib.c
View file

@ -22,8 +22,6 @@ typedef long long unsigned uint64;
#endif
#define int64_t int64
#include "lib/pcre_byte_order.c"
#include "lib/pcre_chartables.c"
#include "lib/pcre_compile.c"