diff options
| author | Cyprinus Carpio <cregams@gmail.com> | 2024-06-30 18:08:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 09:08:00 -0700 |
| commit | a69c5c5c925bb1521d894ef72ca7d99fb2f8f3aa (patch) | |
| tree | 47f12a31f82b814d7ef175d3b94430a7ab1c1326 /src/Fl_Tree.cxx | |
| parent | 1c6a0c1a8fb254945179276ecbd359cc1926fbb1 (diff) | |
Fl_Tree +/- buttons are no longer drawn using bitmaps, different default line color (#995)
Fl_Tree changed to support system color themes (PR #995)
merging CyprinusCarpio's mods carried over from from issue #972.
* Fl_Tree: use named (colormap) colors to support system color themes (see issue #972). changed connectorcolor() default from gray ramp color to FL_INACTIVE_COLOR (Fl_Color(8)), and similar named colormap colors for icon drawing.
* Fl_Tree ⊞ / ⊟ icons (and on macs, ▶ / ▼icons) are now drawn w/fl_draw() functions instead of with xpm bitmaps for colormap control
---------
Co-authored-by: Greg Ercolano <erco@seriss.com>
Diffstat (limited to 'src/Fl_Tree.cxx')
| -rw-r--r-- | src/Fl_Tree.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 40c28039d..25a155947 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -676,8 +676,8 @@ void Fl_Tree::calc_tree() { int W = _tiw; // Adjust root's X/W if connectors off if (_prefs.connectorstyle() == FL_TREE_CONNECTOR_NONE) { - X -= _prefs.openicon()->w(); - W += _prefs.openicon()->w(); + X -= _prefs.openicon_w(); + W += _prefs.openicon_w(); } int xmax = 0, render = 0, ytop = Y; fl_font(_prefs.labelfont(), _prefs.labelsize()); @@ -718,8 +718,8 @@ void Fl_Tree::draw() { int W = _tiw - X + _tix; // Adjust root's X/W if connectors off if (_prefs.connectorstyle() == FL_TREE_CONNECTOR_NONE) { - X -= _prefs.openicon()->w(); - W += _prefs.openicon()->w(); + X -= _prefs.openicon_w(); + W += _prefs.openicon_w(); } // Draw entire tree, starting with root fl_push_clip(_tix,_tiy,_tiw,_tih); |