void CtrlTree::onUpdate( Subject<VarTree, tree_update> &rTree,
tree_update *arg )
{
+ m_firstPos = m_flat ? m_rTree.firstLeaf() : m_rTree.begin();
+
if( arg->i_type == 0 ) // Item update
{
if( arg->b_active_item )
/// \todo handle delete in a more clever way
else if ( arg->i_type == 1 ) // Global change or deletion
{
- m_firstPos = m_flat ? m_rTree.firstLeaf() : m_rTree.begin();
makeImage();
}
else if ( arg->i_type == 2 ) // Item-append
// Redraw the control if the position has changed
m_firstPos = it;
makeImage();
- notifyLayout();
}
void CtrlTree::onPositionChange()
{
makeImage();
- notifyLayout();
}
void CtrlTree::handleEvent( EvtGeneric &rEvent )
/* Select it_sel */
it_sel->m_selected = true;
m_pLastSelected = &*it_sel;
+
+ // Redraw the control
+ makeImage();
+ notifyLayout();
}
else if( key == KEY_PAGEDOWN )
{
ensureVisible( it );
makeImage();
notifyLayout();
- return;
}
}
else if (key == KEY_PAGEUP )
ensureVisible( it );
makeImage();
notifyLayout();
- return;
}
-
-
- for( it = m_flat ? m_rTree.firstLeaf() : m_rTree.begin();
- it != m_rTree.end();
- it = m_flat ? m_rTree.getNextLeaf( it )
- : m_rTree.getNextVisibleItem( it ) )
+ else if ( key == KEY_UP ||
+ key == KEY_DOWN ||
+ key == KEY_LEFT ||
+ key == KEY_RIGHT ||
+ key == KEY_ENTER ||
+ key == ' ' )
{
- VarTree::Iterator next = m_flat ? m_rTree.getNextLeaf( it )
- : m_rTree.getNextVisibleItem( it );
- if( key == KEY_UP )
+ for( it = m_flat ? m_rTree.firstLeaf() : m_rTree.begin();
+ it != m_rTree.end();
+ it = m_flat ? m_rTree.getNextLeaf( it )
+ : m_rTree.getNextVisibleItem( it ) )
{
- // Scroll up one item
- if( ( it->parent()
- && it != it->parent()->begin() )
- || &*it != m_pLastSelected )
+ VarTree::Iterator next = m_flat ?
+ m_rTree.getNextLeaf( it ) :
+ m_rTree.getNextVisibleItem( it );
+ if( key == KEY_UP )
{
- bool nextWasSelected = ( &*next == m_pLastSelected );
- it->m_selected = nextWasSelected;
- if( nextWasSelected )
+ // Scroll up one item
+ if( ( it->parent()
+ && it != it->parent()->begin() )
+ || &*it != m_pLastSelected )
{
- m_pLastSelected = &*it;
- needShow = true; toShow = it;
+ bool nextWasSelected = ( &*next == m_pLastSelected );
+ it->m_selected = nextWasSelected;
+ if( nextWasSelected )
+ {
+ m_pLastSelected = &*it;
+ needShow = true; toShow = it;
+ }
}
}
- }
- else if( key == KEY_DOWN )
- {
- // Scroll down one item
- if( ( it->parent()
- && next != it->parent()->end() )
- || &*it != m_pLastSelected )
- {
- (*it).m_selected = previousWasSelected;
- }
- if( previousWasSelected )
+ else if( key == KEY_DOWN )
{
- m_pLastSelected = &*it;
- needShow = true; toShow = it;
- previousWasSelected = false;
- }
- else
- {
- previousWasSelected = ( &*it == m_pLastSelected );
- }
+ // Scroll down one item
+ if( ( it->parent()
+ && next != it->parent()->end() )
+ || &*it != m_pLastSelected )
+ {
+ (*it).m_selected = previousWasSelected;
+ }
+ if( previousWasSelected )
+ {
+ m_pLastSelected = &*it;
+ needShow = true; toShow = it;
+ previousWasSelected = false;
+ }
+ else
+ {
+ previousWasSelected = ( &*it == m_pLastSelected );
+ }
- // Fix last tree item selection
- if( ( m_flat ? m_rTree.getNextLeaf( it )
- : m_rTree.getNextVisibleItem( it ) ) == m_rTree.end()
- && &*it == m_pLastSelected )
- {
- (*it).m_selected = true;
+ // Fix last tree item selection
+ if( ( m_flat ? m_rTree.getNextLeaf( it )
+ : m_rTree.getNextVisibleItem( it ) ) == m_rTree.end()
+ && &*it == m_pLastSelected )
+ {
+ (*it).m_selected = true;
+ }
}
- }
- else if( key == KEY_RIGHT )
- {
- // Go down one level (and expand node)
- if( &*it == m_pLastSelected )
+ else if( key == KEY_RIGHT )
{
- if( it->m_expanded )
+ // Go down one level (and expand node)
+ if( &*it == m_pLastSelected )
{
- if( it->size() )
+ if( it->m_expanded )
{
- it->m_selected = false;
- it->begin()->m_selected = true;
- m_pLastSelected = &*(it->begin());
+ if( it->size() )
+ {
+ it->m_selected = false;
+ it->begin()->m_selected = true;
+ m_pLastSelected = &*(it->begin());
+ }
+ else
+ {
+ m_rTree.action( &*it );
+ }
}
else
{
- m_rTree.action( &*it );
+ it->m_expanded = true;
+ bChangedPosition = true;
}
}
- else
- {
- it->m_expanded = true;
- bChangedPosition = true;
- }
}
- }
- else if( key == KEY_LEFT )
- {
- // Go up one level (and close node)
- if( &*it == m_pLastSelected )
+ else if( key == KEY_LEFT )
{
- if( it->m_expanded && it->size() )
- {
- it->m_expanded = false;
- bChangedPosition = true;
- }
- else
+ // Go up one level (and close node)
+ if( &*it == m_pLastSelected )
{
- if( it->parent() && it->parent() != &m_rTree)
+ if( it->m_expanded && it->size() )
+ {
+ it->m_expanded = false;
+ bChangedPosition = true;
+ }
+ else
{
- it->m_selected = false;
- m_pLastSelected = it->parent();
- m_pLastSelected->m_selected = true;
+ if( it->parent() && it->parent() != &m_rTree)
+ {
+ it->m_selected = false;
+ m_pLastSelected = it->parent();
+ m_pLastSelected->m_selected = true;
+ }
}
}
}
- }
- else if( key == KEY_ENTER || key == ' ' )
- {
- // Go up one level (and close node)
- if( &*it == m_pLastSelected )
+ else if( key == KEY_ENTER || key == ' ' )
{
- m_rTree.action( &*it );
+ // Go up one level (and close node)
+ if( &*it == m_pLastSelected )
+ {
+ m_rTree.action( &*it );
+ }
}
}
+ if( needShow )
+ ensureVisible( toShow );
+ // Redraw the control
+ makeImage();
+ notifyLayout();
+ }
+ else
+ {
+ // other keys to be forwarded to vlc core
+ EvtKey& rEvtKey = (EvtKey&)rEvent;
+ var_SetInteger( getIntf()->p_libvlc, "key-pressed",
+ rEvtKey.getModKey() );
}
- if( needShow )
- ensureVisible( toShow );
- // Redraw the control
- makeImage();
- notifyLayout();
}
else if( rEvent.getAsString().find( "mouse:left" ) != string::npos )
else if( rEvent.getAsString().find( "scroll" ) != string::npos )
{
- int direction = ((EvtScroll&)rEvent).getDirection();
+ // XXX ctrl_slider.cpp has two more (but slightly different)
+ // XXX implementations of `scroll'. Figure out where it belongs.
+
+ int direction = static_cast<EvtScroll&>(rEvent).getDirection();
double percentage = m_rTree.getPositionVar().get();
double step = 2.0 / (double)( m_flat ? m_rTree.countLeafs()
}
}
iFirst += maxItems();
- if( iFirst >= m_flat ? m_rTree.countLeafs() : m_rTree.visibleItems() )
+ if( iFirst >= (m_flat ? m_rTree.countLeafs() : m_rTree.visibleItems()) )
iFirst = m_flat ? m_rTree.countLeafs() : m_rTree.visibleItems();
float f_new = (float)iFirst / (float)( m_flat ? m_rTree.countLeafs()
:m_rTree.visibleItems() );
bool CtrlTree::mouseOver( int x, int y ) const
{
const Position *pPos = getPosition();
- return ( pPos
- ? x >= 0 && x <= pPos->getWidth() && y >= 0 && y <= pPos->getHeight()
- : false);
+ return !pPos ? false :
+ x >= 0 && x <= pPos->getWidth() && y >= 0 && y <= pPos->getHeight();
}
-void CtrlTree::draw( OSGraphics &rImage, int xDest, int yDest )
+void CtrlTree::draw( OSGraphics &rImage, int xDest, int yDest, int w, int h)
{
- if( m_pImage )
- {
- rImage.drawGraphics( *m_pImage, 0, 0, xDest, yDest );
- }
+ const Position *pPos = getPosition();
+ rect region( pPos->getLeft(), pPos->getTop(),
+ pPos->getWidth(), pPos->getHeight() );
+ rect clip( xDest, yDest, w, h );
+ rect inter;
+
+ if( rect::intersect( region, clip, &inter ) && m_pImage )
+ rImage.drawGraphics( *m_pImage,
+ inter.x - pPos->getLeft(),
+ inter.y - pPos->getTop(),
+ inter.x, inter.y, inter.width, inter.height );
}
bool CtrlTree::ensureVisible( VarTree::Iterator item )
if( it != m_rTree.end()
&& ( focusItemIndex < firstPosIndex
- || focusItemIndex > firstPosIndex + maxItems() ) )
+ || focusItemIndex > firstPosIndex + maxItems() - 1 ) )
{
// Scroll to have the wanted stream visible
VarPercent &rVarPos = m_rTree.getPositionVar();
- rVarPos.set( 1.0 - (double)focusItemIndex /
- (double)( m_flat ? m_rTree.countLeafs()
- : m_rTree.visibleItems() ) );
+ int indexMax = ( m_flat ? m_rTree.countLeafs()
+ : m_rTree.visibleItems() ) - 1;
+ rVarPos.set( 1.0 - (double)focusItemIndex / (double)indexMax );
return true;
}
return false;
for( int yPos = 0; yPos < height; yPos += i_itemHeight )
{
int rectHeight = __MIN( i_itemHeight, height - yPos );
- if( it != m_rTree.end() )
+ if( it == m_rTree.end() )
+ m_pImage->fillRect( 0, yPos, width, rectHeight, bgColor );
+ else
{
uint32_t color = ( it->m_selected ? m_selColor : bgColor );
m_pImage->fillRect( 0, yPos, width, rectHeight, color );
: m_rTree.getNextVisibleItem( it );
} while( it != m_rTree.end() && it->m_deleted );
}
- else
- {
- m_pImage->fillRect( 0, yPos, width, rectHeight, bgColor );
- }
bgColor = ( bgColor == m_bgColor1 ? m_bgColor2 : m_bgColor1 );
}
}
projects / vlc / blobdiff