From a69c5c5c925bb1521d894ef72ca7d99fb2f8f3aa Mon Sep 17 00:00:00 2001 From: Cyprinus Carpio Date: Sun, 30 Jun 2024 18:08:00 +0200 Subject: Fl_Tree +/- buttons are no longer drawn using bitmaps, different default line color (#995) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/Fl_System_Driver.H | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Fl_System_Driver.H') diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H index 3dad3d754..e1bb6b7d3 100644 --- a/src/Fl_System_Driver.H +++ b/src/Fl_System_Driver.H @@ -200,12 +200,8 @@ public: // the implementations of local_to_mac_roman() and mac_roman_to_local() are in fl_encoding_mac_roman.cxx virtual const char *local_to_mac_roman(const char *t, int n); virtual const char *mac_roman_to_local(const char *t, int n); - // the default implementations of tree_openpixmap() and tree_closepixmap() are - // in Fl_Tree_Prefs.cxx and can be enough - virtual Fl_Pixmap *tree_openpixmap(); - virtual Fl_Pixmap *tree_closepixmap(); - static const char *const tree_open_xpm[]; // used by tree_openpixmap() - static const char * const tree_close_xpm[]; // used by tree_closepixmap() + // draw default tree view expando button + virtual void tree_draw_expando_button(int x, int y, bool state, bool active); // the default implementation of tree_connector_style() is in Fl_Tree_Prefs.cxx and can be enough virtual int tree_connector_style(); virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0); -- cgit v1.2.3