Backport "Fix Fl_Table_Row inconsistencies" (#1187)
This commit backports two commits from 'master' (1.4.1 - 1.4.2): 1. "Fix return value of Fl_Table_Row::row_selected(int) (PR #1187)" commita48ebc5db02. "Fix Fl_Table_Row inconsistencies, final part (#1187)" commit0c2aa40bbcFor details see PR #1187 and the referred commits.
This commit is contained in:
Albrecht Schlosser
parent
9ed7752fa1
commit
93830563e9
@ -1,12 +1,10 @@
|
||||
//
|
||||
// "$Id$"
|
||||
//
|
||||
|
||||
#ifndef _FL_TABLE_ROW_H
|
||||
#define _FL_TABLE_ROW_H
|
||||
|
||||
//
|
||||
// Fl_Table_Row -- A row oriented table widget
|
||||
// Fl_Table_Row -- A row oriented table widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// A class specializing in a table of rows.
|
||||
// Handles row-specific selection behavior.
|
||||
@ -17,12 +15,14 @@
|
||||
// the file "COPYING" which should have been included with this file. If this
|
||||
// file is missing or damaged, see the license at:
|
||||
//
|
||||
// http://www.fltk.org/COPYING.php
|
||||
// https://www.fltk.org/COPYING.php
|
||||
//
|
||||
// Please report all bugs and problems to "erco at seriss dot com".
|
||||
// Please see the following page on how to report bugs and issues:
|
||||
//
|
||||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
#include "Fl_Table.H"
|
||||
#include <FL/Fl_Table.H>
|
||||
|
||||
/**
|
||||
A table with row selection capabilities.
|
||||
@ -167,19 +167,11 @@ public:
|
||||
return(_selectmode);
|
||||
}
|
||||
|
||||
/**
|
||||
Checks to see if 'row' is selected. Returns 1 if selected, 0 if not. You can
|
||||
change the selection of a row by clicking on it, or by using
|
||||
select_row(row, flag)
|
||||
*/
|
||||
int row_selected(int row); // is row selected? (0=no, 1=yes, -1=range err)
|
||||
// Checks to see if 'row' is selected. Returns 1 if selected, 0 if not.
|
||||
int row_selected(int row);
|
||||
|
||||
/**
|
||||
Changes the selection state for 'row', depending on the value
|
||||
of 'flag'. 0=deselected, 1=select, 2=toggle existing state.
|
||||
*/
|
||||
int select_row(int row, int flag=1); // select state for row: flag:0=off, 1=on, 2=toggle
|
||||
// returns: 0=no change, 1=changed, -1=range err
|
||||
// Changes the selection state for 'row', depending on the value of 'flag'.
|
||||
int select_row(int row, int flag = 1);
|
||||
|
||||
/**
|
||||
This convenience function changes the selection state
|
||||
@ -195,7 +187,3 @@ public:
|
||||
};
|
||||
|
||||
#endif /*_FL_TABLE_ROW_H*/
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
//
|
||||
// "$Id$"
|
||||
//
|
||||
// Fl_Table_Row -- A row oriented table widget
|
||||
//
|
||||
// A class specializing in a table of rows.
|
||||
@ -12,11 +10,11 @@
|
||||
// the file "COPYING" which should have been included with this file. If this
|
||||
// file is missing or damaged, see the license at:
|
||||
//
|
||||
// http://www.fltk.org/COPYING.php
|
||||
// https://www.fltk.org/COPYING.php
|
||||
//
|
||||
// Please report all bugs and problems on the following page:
|
||||
// Please see the following page on how to report bugs and issues:
|
||||
//
|
||||
// http://www.fltk.org/str.php
|
||||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
//
|
||||
@ -29,10 +27,24 @@
|
||||
#include <FL/fl_draw.H>
|
||||
#include <FL/Fl_Table_Row.H>
|
||||
|
||||
// Is row selected?
|
||||
/**
|
||||
Checks to see if 'row' is selected.
|
||||
|
||||
Returns 1 if selected, 0 if not. You can change the selection of a row
|
||||
by clicking on it, or by using select_row(row, flag)
|
||||
|
||||
\p row \b should be a valid row. If the row is out of range the return
|
||||
value is 0 (zero).
|
||||
|
||||
\param[in] row row to be checked
|
||||
|
||||
\return whether given row is selected
|
||||
\retval 1 row is selected
|
||||
\retval 0 row is not selected or \p row is out of range
|
||||
*/
|
||||
int Fl_Table_Row::row_selected(int row) {
|
||||
if ( row < 0 || row >= rows() ) return(-1);
|
||||
return(_rowselect[row]);
|
||||
if (row < 0 || row >= rows()) return 0;
|
||||
return _rowselect[row];
|
||||
}
|
||||
|
||||
// Change row selection type
|
||||
@ -63,18 +75,22 @@ void Fl_Table_Row::type(TableRowSelectMode val) {
|
||||
}
|
||||
}
|
||||
|
||||
// Change selection state for row
|
||||
//
|
||||
// flag:
|
||||
// 0 - clear selection
|
||||
// 1 - set selection
|
||||
// 2 - toggle selection
|
||||
//
|
||||
// Returns:
|
||||
// 0 - selection state did not change
|
||||
// 1 - selection state changed
|
||||
// -1 - row out of range or incorrect selection mode
|
||||
//
|
||||
/**
|
||||
Changes the selection state for \p 'row', depending on the value of \p 'flag'.
|
||||
|
||||
The optional \p flag can be:
|
||||
- 0: clear selection
|
||||
- 1: set selection (default)
|
||||
- 2: toggle selection
|
||||
|
||||
\param[in] row row to be selected, deselected, or toggled
|
||||
\param[in] flag change mode, see description
|
||||
\return result of modification, see description
|
||||
\retval 0: selection state did not change
|
||||
\retval 1: selection state changed
|
||||
\retval -1: row out of range or incorrect selection mode (\p flag)
|
||||
*/
|
||||
|
||||
int Fl_Table_Row::select_row(int row, int flag) {
|
||||
int ret = 0;
|
||||
if ( row < 0 || row >= rows() ) { return(-1); }
|
||||
@ -150,8 +166,8 @@ void Fl_Table_Row::select_all_rows(int flag) {
|
||||
|
||||
// Set number of rows
|
||||
void Fl_Table_Row::rows(int val) {
|
||||
while ( val > (int)_rowselect.size() ) { _rowselect.push_back(0); } // enlarge
|
||||
Fl_Table::rows(val);
|
||||
while ( val > (int)_rowselect.size() ) { _rowselect.push_back(0); } // enlarge
|
||||
while ( val < (int)_rowselect.size() ) { _rowselect.pop_back(); } // shrink
|
||||
}
|
||||
|
||||
@ -321,7 +337,3 @@ int Fl_Table_Row::handle(int event) {
|
||||
_last_y = _event_y;
|
||||
return(ret);
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id$".
|
||||
//
|
||||
|
||||
Loading…
Reference in New Issue
Block a user