perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes wrong maximum line width in FListView

This commit is contained in:
Markus Gans 2017-09-03 18:32:43 +02:00
parent 5f7737bf64
commit 5a077e73c4
7 changed files with 91 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2017-91-03 Markus Gans <guru.mail@muenster.de>
* Fixes wrong maximum line width in FListView
2017-08-26 Markus Gans <guru.mail@muenster.de> 2017-08-26 Markus Gans <guru.mail@muenster.de>
* Improve code readability through spaces between * Improve code readability through spaces between
the operands and the operators the operands and the operators

28
src/flistbox.cpp
View File

@ -155,8 +155,8 @@ void FListBox::showInsideBrackets ( int index
if ( len >= getWidth() - nf_offset - 3 ) if ( len >= getWidth() - nf_offset - 3 )
{ {
hbar->setMaximum(max_line_width - getWidth() + nf_offset + 4); hbar->setMaximum (max_line_width - getWidth() + nf_offset + 4);
hbar->setPageSize(max_line_width, getWidth() - nf_offset - 4); hbar->setPageSize (max_line_width, getWidth() - nf_offset - 4);
hbar->setValue (xoffset); hbar->setValue (xoffset);
if ( ! hbar->isVisible() ) if ( ! hbar->isVisible() )
@ -323,14 +323,14 @@ void FListBox::remove (int item)
++iter; ++iter;
} }
hbar->setMaximum(max_line_width - getWidth() + nf_offset + 4); hbar->setMaximum (max_line_width - getWidth() + nf_offset + 4);
hbar->setPageSize(max_line_width, getWidth() - nf_offset - 4); hbar->setPageSize (max_line_width, getWidth() - nf_offset - 4);
if ( hbar->isVisible() && max_line_width < getWidth() - nf_offset - 3 ) if ( hbar->isVisible() && max_line_width < getWidth() - nf_offset - 3 )
hbar->hide(); hbar->hide();
vbar->setMaximum(element_count - getHeight() + 2); vbar->setMaximum (element_count - getHeight() + 2);
vbar->setPageSize(element_count, getHeight() - 2); vbar->setPageSize (element_count, getHeight() - 2);
if ( vbar->isVisible() && element_count < getHeight() - 1 ) if ( vbar->isVisible() && element_count < getHeight() - 1 )
vbar->hide(); vbar->hide();
@ -1206,15 +1206,15 @@ void FListBox::adjustSize()
adjustYOffset(); adjustYOffset();
element_count = int(getCount()); element_count = int(getCount());
vbar->setMaximum(element_count - getClientHeight()); vbar->setMaximum (element_count - getClientHeight());
vbar->setPageSize(element_count, getClientHeight()); vbar->setPageSize (element_count, getClientHeight());
vbar->setX(getWidth()); vbar->setX (getWidth());
vbar->setHeight (getClientHeight(), false); vbar->setHeight (getClientHeight(), false);
vbar->resize(); vbar->resize();
hbar->setMaximum(max_line_width - getClientWidth() + 2); hbar->setMaximum (max_line_width - getClientWidth() + 2);
hbar->setPageSize(max_line_width, getClientWidth() - 2); hbar->setPageSize (max_line_width, getClientWidth() - 2);
hbar->setY(getHeight()); hbar->setY (getHeight());
hbar->setWidth (getClientWidth(), false); hbar->setWidth (getClientWidth(), false);
hbar->resize(); hbar->resize();
@ -1644,8 +1644,8 @@ void FListBox::recalculateHorizontalBar (int len, bool has_brackets)
if ( len >= getWidth() - nf_offset - 3 ) if ( len >= getWidth() - nf_offset - 3 )
{ {
hbar->setMaximum(max_line_width - getWidth() + nf_offset + 4); hbar->setMaximum (max_line_width - getWidth() + nf_offset + 4);
hbar->setPageSize(max_line_width, getWidth() - nf_offset - 4); hbar->setPageSize (max_line_width, getWidth() - nf_offset - 4);
hbar->calculateSliderValues(); hbar->calculateSliderValues();
if ( ! hbar->isVisible() ) if ( ! hbar->isVisible() )

134
src/flistview.cpp
View File

@ -16,7 +16,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FListViewItem::FListViewItem (const FListViewItem& item) FListViewItem::FListViewItem (const FListViewItem& item)
: FObject(item.getParent()) : FObject(item.getParent())
, column_line(item.column_line) , column_value(item.column_value)
, data_pointer(item.data_pointer) , data_pointer(item.data_pointer)
, visible_lines(1) , visible_lines(1)
, expandable(false) , expandable(false)
@ -31,7 +31,7 @@ FListViewItem::FListViewItem (const FListViewItem& item)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FListViewItem::FListViewItem (FListViewItem* parent) FListViewItem::FListViewItem (FListViewItem* parent)
: FObject(parent) : FObject(parent)
, column_line() , column_value()
, data_pointer(0) , data_pointer(0)
, visible_lines(1) , visible_lines(1)
, expandable(false) , expandable(false)
@ -48,7 +48,7 @@ FListViewItem::FListViewItem (FListViewItem* parent)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FListViewItem::FListViewItem (FListView* parent) FListViewItem::FListViewItem (FListView* parent)
: FObject(parent) : FObject(parent)
, column_line() , column_value()
, data_pointer(0) , data_pointer(0)
, visible_lines(1) , visible_lines(1)
, expandable(false) , expandable(false)
@ -64,16 +64,16 @@ FListViewItem::FListViewItem ( const std::vector<FString>& cols
, FWidget::data_ptr data , FWidget::data_ptr data
, FListView* parent ) , FListView* parent )
: FObject(parent) : FObject(parent)
, column_line(cols) , column_value(cols)
, data_pointer(data) , data_pointer(data)
, visible_lines(1) , visible_lines(1)
, expandable(false) , expandable(false)
, is_expand(false) , is_expand(false)
{ {
// Replace the control codes characters // Replace the control codes characters
std::vector<FString>::iterator iter = column_line.begin(); std::vector<FString>::iterator iter = column_value.begin();
while ( iter != column_line.end() ) while ( iter != column_value.end() )
{ {
*iter = iter->replaceControlCodes(); *iter = iter->replaceControlCodes();
++iter; ++iter;
@ -89,16 +89,16 @@ FListViewItem::FListViewItem ( const std::vector<FString>& cols
, FWidget::data_ptr data , FWidget::data_ptr data
, FListViewItem* parent ) , FListViewItem* parent )
: FObject(parent) : FObject(parent)
, column_line(cols) , column_value(cols)
, data_pointer(data) , data_pointer(data)
, visible_lines(1) , visible_lines(1)
, expandable(false) , expandable(false)
, is_expand(false) , is_expand(false)
{ {
// Replace the control codes characters // Replace the control codes characters
std::vector<FString>::iterator iter = column_line.begin(); std::vector<FString>::iterator iter = column_value.begin();
while ( iter != column_line.end() ) while ( iter != column_value.end() )
{ {
*iter = iter->replaceControlCodes(); *iter = iter->replaceControlCodes();
++iter; ++iter;
@ -117,20 +117,20 @@ FListViewItem::~FListViewItem()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FString FListViewItem::getText (int column) const FString FListViewItem::getText (int column) const
{ {
if ( column < 0 if ( column < 1
|| column_line.empty() || column_value.empty()
|| column >= int(column_line.size()) ) || column > int(column_value.size()) )
return *fc::empty_string; return *fc::empty_string;
return column_line[uInt(column)]; return column_value[uInt(column - 1)];
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FListViewItem::setText (int column, const FString& text) void FListViewItem::setText (int column, const FString& text)
{ {
if ( column < 0 if ( column < 1
|| column_line.empty() || column_value.empty()
|| column >= int(column_line.size()) ) || column > int(column_value.size()) )
return; return;
FObject* parent = getParent(); FObject* parent = getParent();
@ -139,16 +139,16 @@ void FListViewItem::setText (int column, const FString& text)
{ {
FListView* listview = static_cast<FListView*>(parent); FListView* listview = static_cast<FListView*>(parent);
if ( ! listview->header[uInt(column)].fixed_width ) if ( ! listview->header[uInt(column - 1)].fixed_width )
{ {
int length = int(text.getLength()); int length = int(text.getLength());
if ( length > listview->header[uInt(column)].width ) if ( length > listview->header[uInt(column - 1)].width )
listview->header[uInt(column)].width = length; listview->header[uInt(column - 1)].width = length;
} }
} }
column_line[uInt(column)] = text; column_value[uInt(column - 1)] = text;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -247,10 +247,10 @@ fc::text_alignment FListView::getColumnAlignment (int column) const
{ {
// Get the alignment for a column // Get the alignment for a column
if ( column < 0 || header.empty() || column >= int(header.size()) ) if ( column < 1 || header.empty() || column > int(header.size()) )
return fc::alignLeft; return fc::alignLeft;
return header[uInt(column)].alignment; return header[uInt(column - 1)].alignment;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -258,10 +258,10 @@ FString FListView::getColumnText (int column) const
{ {
// Get the text of column // Get the text of column
if ( column < 0 || header.empty() || column >= int(header.size()) ) if ( column < 1 || header.empty() || column > int(header.size()) )
return *fc::empty_string; return *fc::empty_string;
return header[uInt(column)].name; return header[uInt(column - 1)].name;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -288,10 +288,10 @@ void FListView::setColumnAlignment (int column, fc::text_alignment align)
{ {
// Set the alignment for a column // Set the alignment for a column
if ( column < 0 || header.empty() || column > int(header.size()) ) if ( column < 1 || header.empty() || column > int(header.size()) )
return; {beep();return;}
header[uInt(column)].alignment = align; header[uInt(column - 1)].alignment = align;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -299,46 +299,46 @@ void FListView::setColumnText (int column, const FString& label)
{ {
// Set the text for a column // Set the text for a column
if ( column < 0 || header.empty() || column > int(header.size()) ) if ( column < 1 || header.empty() || column > int(header.size()) )
return; return;
if ( ! header[uInt(column)].fixed_width ) if ( ! header[uInt(column - 1)].fixed_width )
{ {
int length = int(label.getLength()); int length = int(label.getLength());
if ( length > header[uInt(column)].width ) if ( length > header[uInt(column - 1)].width )
header[uInt(column)].width = length; header[uInt(column - 1)].width = length;
} }
header[uInt(column)].name = label; header[uInt(column - 1)].name = label;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
int FListView::addColumn (const FString& label, int width) int FListView::addColumn (const FString& label, int width)
{ {
Header column; Header new_column;
column.name = label; new_column.name = label;
column.width = width; new_column.width = width;
if ( column.width == USE_MAX_SIZE ) if ( new_column.width == USE_MAX_SIZE )
{ {
column.fixed_width = false; new_column.fixed_width = false;
column.width = int(label.getLength()); new_column.width = int(label.getLength());
} }
else else
column.fixed_width = true; new_column.fixed_width = true;
header.push_back (column); header.push_back (new_column);
return int(std::distance(header.begin(), header.end())); return int(std::distance(header.begin(), header.end()));
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FListView::insert (FListViewItem* item) void FListView::insert (FListViewItem* item)
{ {
static const int padding_space = 2; // 1 leading space + 1 tailing space static const int padding_space = 1;
int line_width = padding_space; int line_width = padding_space; // leading space
uInt column = 1; uInt column = 1;
uInt entries = uInt(item->column_line.size()); uInt entries = uInt(item->column_value.size());
headerItems::iterator iter; headerItems::iterator iter;
iter = header.begin(); iter = header.begin();
@ -354,7 +354,7 @@ void FListView::insert (FListViewItem* item)
int len; int len;
if ( column <= entries ) if ( column <= entries )
len = int(item->column_line[column - 1].getLength()); len = int(item->column_value[column - 1].getLength());
else else
len = 0; len = 0;
@ -362,13 +362,12 @@ void FListView::insert (FListViewItem* item)
(*iter).width = len; (*iter).width = len;
} }
line_width += (*iter).width; line_width += (*iter).width + padding_space; // width + tailing space
column++; column++;
++iter; ++iter;
} }
recalculateHorizontalBar (line_width); recalculateHorizontalBar (line_width);
data.push_back (item); data.push_back (item);
int element_count = int(data.size()); int element_count = int(data.size());
@ -416,11 +415,10 @@ void FListView::insert ( const std::vector<long>& cols
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FListView::onKeyPress (FKeyEvent* ev) void FListView::onKeyPress (FKeyEvent* ev)
{ {
static const int padding_space = 2; // 1 leading space + 1 tailing space
int element_count = int(data.size()); int element_count = int(data.size());
int current_before = current; int current_before = current;
int xoffset_before = xoffset; int xoffset_before = xoffset;
int xoffset_end = max_line_width - getClientWidth() + padding_space + 2; int xoffset_end = max_line_width - getClientWidth();
int yoffset_before = yoffset; int yoffset_before = yoffset;
int yoffset_end = element_count - getClientHeight(); int yoffset_end = element_count - getClientHeight();
int key = ev->key(); int key = ev->key();
@ -950,15 +948,15 @@ void FListView::adjustSize()
adjustYOffset(); adjustYOffset();
element_count = int(data.size()); element_count = int(data.size());
vbar->setMaximum(element_count - getClientHeight()); vbar->setMaximum (element_count - getClientHeight());
vbar->setPageSize(element_count, getClientHeight()); vbar->setPageSize (element_count, getClientHeight());
vbar->setX(getWidth()); vbar->setX (getWidth());
vbar->setHeight (getClientHeight(), false); vbar->setHeight (getClientHeight(), false);
vbar->resize(); vbar->resize();
hbar->setMaximum(max_line_width - getClientWidth() + 2); hbar->setMaximum (max_line_width - getClientWidth());
hbar->setPageSize(max_line_width, getClientWidth() - 2); hbar->setPageSize (max_line_width, getClientWidth());
hbar->setY(getHeight() ); hbar->setY (getHeight() );
hbar->setWidth (getClientWidth(), false); hbar->setWidth (getClientWidth(), false);
hbar->resize(); hbar->resize();
@ -1071,7 +1069,7 @@ void FListView::draw()
for (int y = 2; y < getHeight(); y++) for (int y = 2; y < getHeight(); y++)
{ {
setPrintPos (getWidth(),y); setPrintPos (getWidth(),y);
print (' '); // clear right side of the scrollbar print (' '); // clear right side of the scrollbar
} }
} }
@ -1179,7 +1177,14 @@ void FListView::drawColumnLabels()
if ( int(h.size()) <= getClientWidth() ) if ( int(h.size()) <= getClientWidth() )
last = h.end() - 1; last = h.end() - 1;
else else
last = h.begin() + getClientWidth() + xoffset - 1; {
int len = getClientWidth() + xoffset - 1;
if ( len > int(h.size()) )
len = int(h.size());
last = h.begin() + len;
}
setPrintPos (2, 1); setPrintPos (2, 1);
print() << std::vector<char_data>(first, last); print() << std::vector<char_data>(first, last);
@ -1243,13 +1248,13 @@ void FListView::drawList()
FString line = " "; FString line = " ";
// print columns // print columns
if ( ! (*iter)->column_line.empty() ) if ( ! (*iter)->column_value.empty() )
{ {
for (uInt i = 0; i < (*iter)->column_line.size(); i++) for (uInt i = 0; i < (*iter)->column_value.size(); i++)
{ {
static const int leading_space = 1; static const int leading_space = 1;
static const int ellipsis_length = 2; static const int ellipsis_length = 2;
FString text = (*iter)->column_line[i]; FString text = (*iter)->column_value[i];
int width = header[i].width; int width = header[i].width;
uInt txt_length = text.getLength(); uInt txt_length = text.getLength();
fc::text_alignment align = getColumnAlignment(int(i + 1)); fc::text_alignment align = getColumnAlignment(int(i + 1));
@ -1303,8 +1308,8 @@ void FListView::recalculateHorizontalBar (int len)
if ( len >= getWidth() - nf_offset - 3 ) if ( len >= getWidth() - nf_offset - 3 )
{ {
hbar->setMaximum(max_line_width - getWidth() + nf_offset + 4); hbar->setMaximum (max_line_width - getWidth() + nf_offset + 4);
hbar->setPageSize(max_line_width, getWidth() - nf_offset - 4); hbar->setPageSize (max_line_width, getWidth() - nf_offset - 4);
hbar->calculateSliderValues(); hbar->calculateSliderValues();
if ( ! hbar->isVisible() ) if ( ! hbar->isVisible() )
@ -1445,11 +1450,10 @@ void FListView::cb_VBarChange (FWidget*, data_ptr)
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FListView::cb_HBarChange (FWidget*, data_ptr) void FListView::cb_HBarChange (FWidget*, data_ptr)
{ {
static const int padding_space = 2; // 1 leading space + 1 tailing space
FScrollbar::sType scrollType; FScrollbar::sType scrollType;
int distance = 1; int distance = 1;
int xoffset_before = xoffset; int xoffset_before = xoffset;
int xoffset_end = max_line_width - getClientWidth() + padding_space + 2; int xoffset_end = max_line_width - getClientWidth();
scrollType = hbar->getScrollType(); scrollType = hbar->getScrollType();
switch ( scrollType ) switch ( scrollType )
@ -1458,7 +1462,7 @@ void FListView::cb_HBarChange (FWidget*, data_ptr)
break; break;
case FScrollbar::scrollPageBackward: case FScrollbar::scrollPageBackward:
distance = getClientWidth() - padding_space; distance = getClientWidth();
// fall through // fall through
case FScrollbar::scrollStepBackward: case FScrollbar::scrollStepBackward:
xoffset -= distance; xoffset -= distance;
@ -1468,7 +1472,7 @@ void FListView::cb_HBarChange (FWidget*, data_ptr)
break; break;
case FScrollbar::scrollPageForward: case FScrollbar::scrollPageForward:
distance = getClientWidth() - padding_space; distance = getClientWidth();
// fall through // fall through
case FScrollbar::scrollStepForward: case FScrollbar::scrollStepForward:
xoffset += distance; xoffset += distance;

4
src/flistview.h
View File

@ -88,7 +88,7 @@ class FListViewItem : public FObject
int getVisibleLines(); int getVisibleLines();
// Data Member // Data Member
std::vector<FString> column_line; std::vector<FString> column_value;
FWidget::data_ptr data_pointer; FWidget::data_ptr data_pointer;
int visible_lines; int visible_lines;
bool expandable; bool expandable;
@ -107,7 +107,7 @@ inline const char* FListViewItem::getClassName() const
//---------------------------------------------------------------------- //----------------------------------------------------------------------
inline uInt FListViewItem::getColumnCount() const inline uInt FListViewItem::getColumnCount() const
{ return uInt(column_line.size()); } { return uInt(column_value.size()); }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
inline bool FListViewItem::isExpand() inline bool FListViewItem::isExpand()

1
src/foptiattr.cpp
View File

@ -1022,6 +1022,7 @@ inline bool FOptiAttr::unsetTermDoubleUnderline (char_data*& term)
else else
return false; return false;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FOptiAttr::setTermAttributes ( char_data*& term bool FOptiAttr::setTermAttributes ( char_data*& term
, bool p1, bool p2, bool p3 , bool p1, bool p2, bool p3

1
src/frect.cpp
View File

@ -207,6 +207,7 @@ FRect FRect::combined (const FRect& r) const
new_rect.Y2 = std::max(Y2, r.Y2); new_rect.Y2 = std::max(Y2, r.Y2);
return new_rect; return new_rect;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FRect& FRect::operator = (const FRect& r) FRect& FRect::operator = (const FRect& r)
{ {

1
src/fstatusbar.cpp
View File

@ -200,6 +200,7 @@ void FStatusBar::hide()
print (blank); print (blank);
delete[] blank; delete[] blank;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FStatusBar::drawMessage() void FStatusBar::drawMessage()
{ {