Changeset 3f3e22d for src/mvc/delegate.cpp
- Timestamp:
- 01/21/10 16:39:43 (13 years ago)
- Branches:
- master, qt5
- Children:
- 76cde75
- Parents:
- a957cfa
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mvc/delegate.cpp
ra957cfa r3f3e22d 136 136 //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict()) 137 137 if(bkgrColor == Qt::yellow) 138 { 138 139 painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image()); 140 mControls[WarningControlOn]->hasConflict=true; 141 } 139 142 else 143 { 140 144 painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image()); 145 mControls[WarningControlOn]->hasConflict=false; 146 } 141 147 142 148 // draw texts … … 310 316 { 311 317 ControlId id = i.next(); 312 if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint)) 318 if((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint)) 319 && (id != WarningControlOn) && (id != WarningControlOff)) 320 { 313 321 return id; 322 } 323 else 324 { 325 if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint)) 326 && (mControls[id]->hasConflict)) 327 { 328 return id; 329 } 330 } 314 331 } 315 332 … … 369 386 control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.png")); 370 387 p = mControls[MapControl]->drawPoint(); 388 control->hasConflict = false; 371 389 p.setX(p.x()-control->image()->width()-SPACER); 372 390 control->setDrawPoint(p); … … 375 393 control = new Control(WarningControlOff,QString(":icons/exclamation-iconOff.png")); 376 394 p = mControls[MapControl]->drawPoint(); 395 control->hasConflict = false; 377 396 p.setX(p.x()-control->image()->width()-SPACER); 378 397 control->setDrawPoint(p);
Note: See TracChangeset
for help on using the changeset viewer.