mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-23 14:22:41 -06:00
TreeCtrl: Fixed visuals of multiselect cursor
git-svn-id: svn://ultimatepp.org/upp/trunk@9623 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
a22c57d743
commit
fbd1fa0a4d
2 changed files with 5 additions and 4 deletions
|
|
@ -181,7 +181,7 @@ ector]<[_^String^ String]>`&_[*@3 arg], [@(0.0.255) const]_[@(0.0.255) char]_`*[
|
|||
`=_NULL)&]
|
||||
[s2;%% Equivalent of default constructor and then invoking Start([%-*@3 cmd][%- ,
|
||||
][%-*@3 arg][%- , ][%-*@3 envptr]).&]
|
||||
[s0; &]
|
||||
[s3; &]
|
||||
[ {{10000@(113.42.0) [s0;%% [*@7;4 Global functions related to LocalProcess]]}}&]
|
||||
[s3;%% &]
|
||||
[s5;:Sys`(const char`*`,String`&`,bool`): [@(0.0.255) int]_[* Sys]([@(0.0.255) const]_[@(0.0.255) c
|
||||
|
|
|
|||
|
|
@ -1046,9 +1046,10 @@ void TreeCtrl::Paint(Draw& w)
|
|||
x += csz.cx;
|
||||
if(x < sz.cx) {
|
||||
const Display *d = GetStyle(i, fg, bg, st);
|
||||
int ctx = highlight_ctrl * csz.cx;
|
||||
Rect br = RectC(x, y, vsz.cx + 2 * m.margin + ctx, msz.cy);
|
||||
if(!IsNull(m.value) || m.ctrl && highlight_ctrl) {
|
||||
int ctx = highlight_ctrl * csz.cx;
|
||||
w.DrawRect(x, y, vsz.cx + 2 * m.margin + ctx, msz.cy, bg);
|
||||
w.DrawRect(br, bg);
|
||||
Rect r = RectC(x + ctx + m.margin, y + (msz.cy - vsz.cy) / 2, vsz.cx, vsz.cy);
|
||||
w.Clip(r);
|
||||
d->Paint(w, r, m.value, fg, bg, st);
|
||||
|
|
@ -1056,7 +1057,7 @@ void TreeCtrl::Paint(Draw& w)
|
|||
}
|
||||
if(i == cursor && !nocursor && multiselect && GetSelectCount() != 1 && HasFocus()
|
||||
&& !IsDragAndDropTarget())
|
||||
DrawFocus(w, fr, st & Display::SELECT ? SColorPaper() : SColorText());
|
||||
DrawFocus(w, br, st & Display::SELECT ? SColorPaper() : SColorText());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue