summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_System_Driver.H8
-rw-r--r--src/Fl_Tree.cxx8
-rw-r--r--src/Fl_Tree_Item.cxx29
-rw-r--r--src/Fl_Tree_Prefs.cxx88
-rw-r--r--src/drivers/Darwin/Fl_Darwin_System_Driver.H5
-rw-r--r--src/drivers/Darwin/Fl_Darwin_System_Driver.cxx49
6 files changed, 51 insertions, 136 deletions
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);
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);
diff --git a/src/Fl_Tree_Item.cxx b/src/Fl_Tree_Item.cxx
index 544170a32..a9e192692 100644
--- a/src/Fl_Tree_Item.cxx
+++ b/src/Fl_Tree_Item.cxx
@@ -9,6 +9,7 @@
#include <FL/Fl_Tree_Prefs.H>
#include <FL/Fl_Tree.H>
#include <FL/fl_string_functions.h>
+#include "Fl_System_Driver.H"
//////////////////////
// Fl_Tree_Item.cxx
@@ -804,7 +805,7 @@ Fl_Tree_Item *Fl_Tree_Item::find_clicked(const Fl_Tree_Prefs &prefs, int yonly)
/// - visibility (if !is_visible(), returns 0)
/// - labelfont() height: if label() != NULL
/// - widget() height: if widget() != NULL
-/// - openicon() height (if not NULL)
+/// - openicon() height (if has children)
/// - usericon() height (if not NULL)
/// Does NOT include Fl_Tree::linespacing();
/// \returns maximum pixel height
@@ -821,8 +822,8 @@ int Fl_Tree_Item::calc_item_height(const Fl_Tree_Prefs &prefs) const {
H < widget()->h()) {
H = widget()->h();
}
- if ( has_children() && prefs.openicon() && H<prefs.openicon()->h() )
- H = prefs.openicon()->h();
+ if ( has_children() && H < prefs.openicon_h() )
+ H = prefs.openicon_h();
if ( usericon() && H<usericon()->h() )
H = usericon()->h();
return(H);
@@ -990,13 +991,13 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Tree_Item *itemfocus,
// We don't care about items clipped off the viewport; they won't get mouse events.
//
int item_y_center = Y+(H/2);
- _collapse_xywh[2] = prefs.openicon()->w();
+ _collapse_xywh[2] = prefs.openicon_w();
int &icon_w = _collapse_xywh[2];
_collapse_xywh[0] = X + (icon_w + prefs.connectorwidth())/2 - 3;
int &icon_x = _collapse_xywh[0];
- _collapse_xywh[1] = item_y_center - (prefs.openicon()->h()/2);
+ _collapse_xywh[1] = item_y_center - prefs.openicon_h()/2;
int &icon_y = _collapse_xywh[1];
- _collapse_xywh[3] = prefs.openicon()->h();
+ _collapse_xywh[3] = prefs.openicon_h();
// Horizontal connector values
// Must calculate these even if(clipped) because 'draw children' code (below)
@@ -1080,11 +1081,19 @@ void Fl_Tree_Item::draw(int X, int &Y, int W, Fl_Tree_Item *itemfocus,
if ( render && has_children() && prefs.showcollapse() ) {
// Draw icon image
if ( is_open() ) {
- if ( active ) prefs.closeicon()->draw(icon_x,icon_y);
- else prefs.closedeicon()->draw(icon_x,icon_y);
+ if ( prefs.closeicon() ) {
+ if ( active ) prefs.closeicon()->draw(icon_x, icon_y);
+ else prefs.closedeicon()->draw(icon_x, icon_y);
+ } else {
+ Fl::system_driver()->tree_draw_expando_button(icon_x, icon_y, false, active);
+ }
} else {
- if ( active ) prefs.openicon()->draw(icon_x,icon_y);
- else prefs.opendeicon()->draw(icon_x,icon_y);
+ if ( prefs.openicon() ) {
+ if ( active ) prefs.openicon()->draw(icon_x, icon_y);
+ else prefs.opendeicon()->draw(icon_x, icon_y);
+ } else {
+ Fl::system_driver()->tree_draw_expando_button(icon_x, icon_y, true, active);
+ }
}
}
// Draw user icon (if any)
diff --git a/src/Fl_Tree_Prefs.cxx b/src/Fl_Tree_Prefs.cxx
index aa0d17c3b..f34675c9c 100644
--- a/src/Fl_Tree_Prefs.cxx
+++ b/src/Fl_Tree_Prefs.cxx
@@ -22,12 +22,9 @@
#include "Fl_System_Driver.H"
#include <FL/Fl.H>
-#include <FL/Fl_Pixmap.H>
+#include <FL/Fl_Image.H>
#include <FL/Fl_Tree_Prefs.H>
-
-// INTERNAL: BUILT IN OPEN/STOW XPMS
-// These can be replaced via prefs.openicon()/closeicon()
-//
+#include <FL/fl_draw.H>
/**
\cond DriverDev
@@ -35,61 +32,16 @@
\{
*/
-const char * const Fl_System_Driver::tree_open_xpm[] = {
- "11 11 3 1",
- ". c #fefefe",
- "# c #444444",
- "@ c #000000",
- "###########",
- "#.........#",
- "#.........#",
- "#....@....#",
- "#....@....#",
- "#..@@@@@..#",
- "#....@....#",
- "#....@....#",
- "#.........#",
- "#.........#",
- "###########"
-};
-
-const char * const Fl_System_Driver::tree_close_xpm[] = {
-"11 11 3 1",
-". c #fefefe",
-"# c #444444",
-"@ c #000000",
-"###########",
-"#.........#",
-"#.........#",
-"#.........#",
-"#.........#",
-"#..@@@@@..#",
-"#.........#",
-"#.........#",
-"#.........#",
-"#.........#",
-"###########"
-};
-
-
-/**
- Return the address of a pixmap that show a plus in a box.
-
- This pixmap is used to indicate a brach of a tree that is closed and
- can be opened by clicking it.
-
- Other platforms may use other symbols which can be reimplemented in the
- driver. Notably, Apple Mac systems mark a closed branch with a triangle
- pointing to the right, and an open branch with a triangle pointing down.
- */
-Fl_Pixmap *Fl_System_Driver::tree_openpixmap() {
- static Fl_Pixmap *pixmap = new Fl_Pixmap(tree_open_xpm);
- return pixmap;
-}
-
-Fl_Pixmap *Fl_System_Driver::tree_closepixmap() {
- static Fl_Pixmap *pixmap = new Fl_Pixmap(tree_close_xpm);
- return pixmap;
+// Draw non-OS specific Fl_Tree open/close icons
+// ┌───┐ ┌───┐
+// │ + │ │ - │
+// └───┘ └───┘
+void Fl_System_Driver::tree_draw_expando_button(int x, int y, bool state, bool active) {
+ fl_rectf(x, y, 11, 11, active ? FL_BACKGROUND2_COLOR : fl_inactive(FL_BACKGROUND2_COLOR)); // fill
+ fl_rect(x, y, 11, 11, FL_INACTIVE_COLOR); // outline
+ fl_color(active ? FL_FOREGROUND_COLOR : FL_INACTIVE_COLOR);
+ fl_line(x + 3, y + 5, x + 7, y + 5); // horiz line
+ if (state) fl_line(x + 5, y + 3, x + 5, y + 7); // vert line
}
int Fl_System_Driver::tree_connector_style() {
@@ -109,7 +61,7 @@ int Fl_System_Driver::tree_connector_style() {
/// \param[in] val -- The new image, or zero to use the default [+] icon.
///
void Fl_Tree_Prefs::openicon(Fl_Image *val) {
- _openimage = val ? val : Fl::system_driver()->tree_openpixmap();
+ _openimage = val ? val : 0;
// Update deactivated version of icon..
if ( _opendeimage ) delete _opendeimage;
if ( _openimage ) {
@@ -126,7 +78,7 @@ void Fl_Tree_Prefs::openicon(Fl_Image *val) {
/// \param[in] val -- The new image, or zero to use the default [-] icon.
///
void Fl_Tree_Prefs::closeicon(Fl_Image *val) {
- _closeimage = val ? val : Fl::system_driver()->tree_closepixmap();
+ _closeimage = val ? val : 0;
// Update deactivated version of icon..
if ( _closedeimage ) delete _closedeimage;
if ( _closeimage ) {
@@ -151,15 +103,13 @@ Fl_Tree_Prefs::Fl_Tree_Prefs() {
_linespacing = 0;
_labelfgcolor = FL_FOREGROUND_COLOR;
_labelbgcolor = 0xffffffff; // we use this as 'transparent'
- _connectorcolor = Fl_Color(43);
+ _connectorcolor = FL_INACTIVE_COLOR;
_connectorstyle = (Fl_Tree_Connector)Fl::system_driver()->tree_connector_style();
- _openimage = Fl::system_driver()->tree_openpixmap();
- _closeimage = Fl::system_driver()->tree_closepixmap();
+ _openimage = 0;
+ _closeimage = 0;
_userimage = 0;
- _opendeimage = _openimage->copy();
- _opendeimage->inactive();
- _closedeimage = _closeimage->copy();
- _closedeimage->inactive();
+ _opendeimage = 0;
+ _closedeimage = 0;
_userdeimage = 0;
_showcollapse = 1;
_showroot = 1;
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
index 776f68738..011bea7ff 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
@@ -64,10 +64,7 @@ public:
const char *latin1_to_local(const char *t, int n) FL_OVERRIDE;
const char *local_to_mac_roman(const char *t, int n) FL_OVERRIDE;
const char *mac_roman_to_local(const char *t, int n) FL_OVERRIDE;
- Fl_Pixmap *tree_openpixmap() FL_OVERRIDE;
- static const char * const tree_open_xpm_darwin[]; // used by tree_openpixmap()
- Fl_Pixmap *tree_closepixmap() FL_OVERRIDE;
- static const char * const tree_close_xpm_darwin[]; // used by tree_closepixmap()
+ void tree_draw_expando_button(int x, int y, bool state, bool active) FL_OVERRIDE;
int tree_connector_style() FL_OVERRIDE;
const char *filename_name(const char *buf) FL_OVERRIDE;
void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0) FL_OVERRIDE;
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
index c44ba34c1..9b6a2a694 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
@@ -21,6 +21,7 @@
#include <FL/Fl_Tree_Prefs.H>
#include <FL/Fl_Pixmap.H>
#include <FL/platform.H>
+#include <FL/fl_draw.H>
#include "../../flstring.h"
#include <string.h>
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
@@ -357,50 +358,12 @@ Fl_Sys_Menu_Bar_Driver *Fl_Darwin_System_Driver::sys_menu_bar_driver()
return Fl_MacOS_Sys_Menu_Bar_Driver::driver();
}
-const char * const Fl_Darwin_System_Driver::tree_open_xpm_darwin[] = {
- "11 11 2 1",
- ". c None",
- "@ c #000000",
- "...@.......",
- "...@@......",
- "...@@@.....",
- "...@@@@....",
- "...@@@@@...",
- "...@@@@@@..",
- "...@@@@@...",
- "...@@@@....",
- "...@@@.....",
- "...@@......",
- "...@......."
-};
-
-const char * const Fl_Darwin_System_Driver::tree_close_xpm_darwin[] = {
- "11 11 2 1",
- ". c None",
- "@ c #000000",
- "...........",
- "...........",
- "...........",
- "@@@@@@@@@@@",
- ".@@@@@@@@@.",
- "..@@@@@@@..",
- "...@@@@@...",
- "....@@@....",
- ".....@.....",
- "...........",
- "..........."
-};
-
-Fl_Pixmap *Fl_Darwin_System_Driver::tree_openpixmap() {
- static Fl_Pixmap *pixmap = new Fl_Pixmap(tree_open_xpm_darwin);
- return pixmap;
+// Draw Mac-specific Fl_Tree open/close icons
+void Fl_Darwin_System_Driver::tree_draw_expando_button(int x, int y, bool state, bool active) {
+ fl_color(active ? FL_FOREGROUND_COLOR : FL_INACTIVE_COLOR);
+ if(state) fl_polygon(x + 3, y, x + 3, y + 11, x + 8, y + 5); // right arrow: ▶
+ else fl_polygon(x, y + 3, x + 11, y + 3, x + 5, y + 8); // down arrow: ▼
}
-
-Fl_Pixmap *Fl_Darwin_System_Driver::tree_closepixmap() {
- static Fl_Pixmap *pixmap = new Fl_Pixmap(tree_close_xpm_darwin);
- return pixmap;
-}
-
int Fl_Darwin_System_Driver::tree_connector_style() {
return FL_TREE_CONNECTOR_NONE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 11:54:37 +0000