Reduce CPU usage of triggerless device polling routine

Fix TDEListView not emitting executed signal for part of entire highlighted item area
(cherry picked from commit b282a7bb89)
v3.5.13-sru
Timothy Pearson 11 years ago committed by Slávek Banko
parent c1d2654b77
commit a4be37c118

@ -247,7 +247,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos )
m_pAutoSelect->stop();
//Don<EFBFBD>t emit executed if in SC mode and Shift or Ctrl are pressed
//Don't emit executed if in SC mode and Shift or Ctrl are pressed
if( !( m_bUseSingle && ((keybstate & ShiftButton) || (keybstate & ControlButton)) ) ) {
setSelected( item, false );
viewport()->unsetCursor();

@ -489,36 +489,45 @@ bool KListView::isExecuteArea( int x )
bool KListView::isExecuteArea( int x, TQListViewItem* item )
{
if( allColumnsShowFocus() )
return true;
else {
int offset = 0;
int width = columnWidth( 0 );
TQHeader* const thisHeader = header();
const int pos = thisHeader->mapToIndex( 0 );
for ( int index = 0; index < pos; ++index )
offset += columnWidth( thisHeader->mapToSection( index ) );
x += contentsX(); // in case of a horizontal scrollbar
if ( item )
{
width = treeStepSize()*( item->depth() + ( rootIsDecorated() ? 1 : 0 ) );
width += itemMargin();
int ca = AlignHorizontal_Mask & columnAlignment( 0 );
if ( ca == AlignLeft || ca == AlignAuto ) {
width += item->width( fontMetrics(), this, 0 );
if ( width > columnWidth( 0 ) )
width = columnWidth( 0 );
if ( allColumnsShowFocus() ) {
return true;
}
else {
int offset = 0;
int width = columnWidth( 0 );
TQHeader* const thisHeader = header();
const int pos = thisHeader->mapToIndex( 0 );
for ( int index = 0; index < pos; ++index ) {
offset += columnWidth( thisHeader->mapToSection( index ) );
}
x += contentsX(); // in case of a horizontal scrollbar
// What was this supposed to do???
// Just use the column width, as at least one entire column is highlighted on row selection!
#if 0
if ( item ) {
width = treeStepSize()*( item->depth() + ( rootIsDecorated() ? 1 : 0 ) );
width += itemMargin();
int ca = AlignHorizontal_Mask & columnAlignment( 0 );
if ( ca == AlignLeft || ca == AlignAuto ) {
width += item->width( fontMetrics(), this, 0 );
if ( width > columnWidth( 0 ) ) {
width = columnWidth( 0 );
}
}
}
#endif
if ( item ) {
if (!allColumnsShowFocus()) {
offset += treeStepSize()*( item->depth() + ( rootIsDecorated() ? 1 : 0 ) );
}
}
return ( x > offset && x < ( offset + width ) );
}
}
return ( x > offset && x < ( offset + width ) );
}
}
void KListView::slotOnItem( TQListViewItem *item )
@ -883,8 +892,9 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
// We don't want to call the parent method because it does setOpen,
// whereas we don't do it in single click mode... (David)
//TQListView::contentsMouseDoubleClickEvent( e );
if ( !e || e->button() != Qt::LeftButton )
if ( !e || e->button() != Qt::LeftButton ) {
return;
}
TQPoint vp = contentsToViewport(e->pos());
TQListViewItem *item = itemAt( vp );
@ -895,15 +905,17 @@ void KListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
if( item ) {
emit doubleClicked( item, e->globalPos(), col );
if( (e->button() == Qt::LeftButton) && !d->bUseSingle )
if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) {
emitExecute( item, e->globalPos(), col );
}
}
}
void KListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c )
{
if( (btn == Qt::LeftButton) && item )
if( (btn == Qt::LeftButton) && item ) {
emitExecute(item, pos, c);
}
}
void KListView::contentsDropEvent(TQDropEvent* e)
@ -2365,7 +2377,7 @@ void KListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
void KListView::selectAll( bool select )
{
if ( selectionMode() == Multi || selectionMode() == Extended ) {
if ( ((SelectionModeExt)selectionMode() == Multi) || ((SelectionModeExt)selectionMode() == Extended) ) {
bool b = signalsBlocked();
blockSignals( TRUE );
bool anything = FALSE;

@ -36,7 +36,7 @@ class KLineEdit;
* There is a new signal executed(). It gets connected to either
* TQListView::clicked() or TQListView::doubleClicked() depending on the KDE
* wide Single Click/Double Click settings. It is strongly recommended that
* you use this signal instead of the above mentioned. This way you don´t
* you use this signal instead of the above mentioned. This way you don't
* need to care about the current settings.
* If you want to get informed when the user selects something connect to the
* TQListView::selectionChanged() signal.

Loading…
Cancel
Save