github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 06:12:47 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Fixed appearance of small disabled scrollbars

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3461 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-05-26 13:47:13 +00:00
parent 22c7b8ae3e
commit 02899206c2
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
uppsrc/CtrlLib/ScrollBar.cpp
View file

@ -70,12 +70,12 @@ ScrollBar::ScrollBar() {
ScrollBar::~ScrollBar() {}
Rect ScrollBar::Slider() const
Rect ScrollBar::Slider(int& cc) const
{
Size sz = GetSize();
Rect r;
if(IsHorz()) {
int cc = sz.cx > (3 + style->isleft2 + style->isright2) * style->arrowsize ? style->arrowsize : 0;
cc = sz.cx > (3 + style->isleft2 + style->isright2) * style->arrowsize ? style->arrowsize : 0;
r = RectC(cc, 0, sz.cx - 2 * cc, sz.cy);
if(style->isleft2)
r.right -= cc;
@ -83,7 +83,7 @@ Rect ScrollBar::Slider() const
r.left += cc;
}
else {
int cc = sz.cy > (3 + style->isup2 + style->isdown2) * style->arrowsize ? style->arrowsize : 0;
cc = sz.cy > (3 + style->isup2 + style->isdown2) * style->arrowsize ? style->arrowsize : 0;
r = RectC(0, cc, sz.cx, sz.cy - 2 * cc);
if(style->isup2)
r.bottom -= cc;
@ -93,6 +93,12 @@ Rect ScrollBar::Slider() const
return r;
}
Rect ScrollBar::Slider() const
{
int dummy;
return Slider(dummy);
}
int& ScrollBar::HV(int& h, int& v) const
{
return IsHorz() ? h : v;
@ -126,7 +132,8 @@ Rect ScrollBar::GetPartRect(int p) const {
void ScrollBar::Paint(Draw& w) {
w.DrawRect(GetSize(), SColorPaper());
Size sz = style->through ? GetSize() : Slider().GetSize();
int cc;
Size sz = style->through ? GetSize() : Slider(cc).GetSize();
light = GetMousePart();
int p = push;
if(!HasCapture())
@ -150,17 +157,18 @@ void ScrollBar::Paint(Draw& w) {
}
}
else
if(style->through) {
if(style->through)
ChPaint(w, sz, l[0][CTRL_DISABLED]);
}
else
if(IsHorz()) {
ChPaint(w, style->arrowsize, 0, sz.cx / 2, sz.cy, l[0][CTRL_DISABLED]);
ChPaint(w, style->arrowsize + sz.cx / 2, 0, sz.cx - sz.cx / 2, sz.cy, l[1][CTRL_DISABLED]);
ChPaint(w, cc, 0, sz.cx / 2, sz.cy, l[0][CTRL_DISABLED]);
ChPaint(w, cc + sz.cx / 2, 0, sz.cx - sz.cx / 2, sz.cy, l[1][CTRL_DISABLED]);
}
else {
ChPaint(w, 0, style->arrowsize, sz.cx, sz.cy / 2, l[0][CTRL_DISABLED]);
ChPaint(w, 0, style->arrowsize + sz.cy / 2, sz.cx, sz.cy - sz.cy / 2, l[1][CTRL_DISABLED]);
ChPaint(w, 0, cc, sz.cx, sz.cy / 2, l[0][CTRL_DISABLED]);
ChPaint(w, 0, cc + sz.cy / 2, sz.cx, sz.cy - sz.cy / 2, l[1][CTRL_DISABLED]);
// w.DrawRect(0, cc, sz.cx, sz.cy / 2, Red()); _DBG_
// w.DrawRect(0, cc + sz.cy / 2, sz.cx, sz.cy - sz.cy / 2, Green()); _DBG_
}
}

1
uppsrc/CtrlLib/ScrollBar.h
View file

@ -46,6 +46,7 @@ private:
const Style *style;
Rect Slider(int& cc) const;
Rect Slider() const;
int& HV(int& h, int& v) const;
int GetHV(int h, int v) const;