diff --git a/uppsrc/CtrlCore/CtrlDraw.cpp b/uppsrc/CtrlCore/CtrlDraw.cpp index 18872787a..c46aa908f 100644 --- a/uppsrc/CtrlCore/CtrlDraw.cpp +++ b/uppsrc/CtrlCore/CtrlDraw.cpp @@ -168,7 +168,7 @@ void Ctrl::ScrollView(const Rect& _r, int dx, int dy) #else if(IsFullRefresh() || !IsVisible()) return; - if(isdhctrl) { + if(hasdhctrl) { Refresh(_r); return; } diff --git a/uppsrc/CtrlCore/DrawTextX11.cpp b/uppsrc/CtrlCore/DrawTextX11.cpp index bf4ecda2a..cfba78501 100644 --- a/uppsrc/CtrlCore/DrawTextX11.cpp +++ b/uppsrc/CtrlCore/DrawTextX11.cpp @@ -115,8 +115,6 @@ CommonFontInfo XftGetFontInfoSys(Font font) if(xftfont) { fi.ascent = (int16)xftfont->ascent; fi.descent = (int16)xftfont->descent; - fi.height = fi.ascent + fi.descent; - fi.lineheight = (int16)xftfont->height; fi.external = 0; fi.internal = 0; fi.overhang = 0; diff --git a/uppsrc/Draw/ImageOp.cpp b/uppsrc/Draw/ImageOp.cpp index 7b1031b95..fe7d7a1e8 100644 --- a/uppsrc/Draw/ImageOp.cpp +++ b/uppsrc/Draw/ImageOp.cpp @@ -234,7 +234,6 @@ void AutoCrop(Image *m, int count, RGBA bg) for(int i = 1; i < count; i++) r.Union(FindBounds(m[i], bg)); for(int i = 0; i < count; i++) { - Rect rr = r.GetSize(); Point p1 = m[i].GetHotSpot() - r.TopLeft(); Point p2 = m[i].Get2ndSpot() - r.TopLeft(); m[i] = WithHotSpots(Crop(m[i], r), p1.x, p1.y, p2.x, p2.y);