github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Another X11 TopWindow fix (thanks Klugier)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6309 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-09-04 17:26:33 +00:00
parent f563b8292e
commit 7b5ab757c8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlCore/X11Top.cpp
View file

@ -192,14 +192,14 @@ void TopWindow::SyncCaption()
Ctrl *owner = GetOwner();
wm_hints->window_group = owner ? owner->GetWindow() : w;
if(!icon.IsEmpty()) {
Size isz = icon.GetSize();
Size isz = largeicon.IsEmpty() ? icon.GetSize() : largeicon.GetSize();
int len = 2 + isz.cx * isz.cy;
Buffer<unsigned long> data(len);
unsigned long *t = data;
*t++ = isz.cx;
*t++ = isz.cy;
for(int y = 0; y < isz.cy; y++) {
const RGBA *q = icon[y];
const RGBA *q = largeicon.IsEmpty() ? icon[y] : largeicon[y];
for(int x = isz.cx; x--;) {
*t++ = ((dword)q->a << 24) |
(dword)q->b | ((dword)q->g << 8) | ((dword)q->r << 16);
@ -239,7 +239,7 @@ void TopWindow::CenterRect(Ctrl *owner)
r = wr;
Point p = r.CenterPos(sz);
if (p.x <= wr.Width() && p.y <= wr.Height()) {
if (p.x + sz.cx <= wr.Width() && p.y + sz.cy <= wr.Height()) {
r = RectC(p.x, p.y, sz.cx, sz.cy);
wr.left += fm.left;
wr.right -= fm.right;