diff options
Diffstat (limited to 'src/note.cpp')
-rw-r--r-- | src/note.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/note.cpp b/src/note.cpp index 436441d..adf859d 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -853,20 +853,20 @@ void Note::unsetWidth() child->unsetWidth(); } -void Note::requestRetqlayout() +void Note::requestRelayout() { m_width = 0; unbufferize(); - basket()->relayoutNotes(true); // TODO: A signal that will retqlayout ONCE and DELAYED if called several times + basket()->relayoutNotes(true); // TODO: A signal that will relayout ONCE and DELAYED if called several times } void Note::setWidth(int width) // TODO: inline ? { if (m_width != width) - setWidthForceRetqlayout(width); + setWidthForceRelayout(width); } -void Note::setWidthForceRetqlayout(int width) +void Note::setWidthForceRelayout(int width) { unbufferize(); m_width = (width < minWidth() ? minWidth() : width); @@ -970,7 +970,7 @@ void Note::toggleFolded(bool animate) if (animate) { // We animate collapsing (so sub-notes fluidly go under the first note) - // We don't animate expanding: we place sub-notes directly under the first note (and the next retqlayout will animate the expanding) + // We don't animate expanding: we place sub-notes directly under the first note (and the next relayout will animate the expanding) // But if user quickly collapsed and then expand (while the collapsing animation isn't finished), we animate anyway bool animateSetUnder = (m_isFolded || !m_collapseFinished); // std::cout << "fold:" << m_isFolded << " collapseFinished:" << m_collapseFinished << " animateSetUnder:" << animateSetUnder << std::endl; @@ -1098,7 +1098,7 @@ void Note::relayoutAt(int x, int y, bool animate) m_computedAreas = false; m_areas.clear(); - // Don't retqlayout free notes one under the other, because by definition they are freely positionned! + // Don't relayout free notes one under the other, because by definition they are freely positionned! if (isFree()) { x = finalX(); y = finalY(); @@ -1109,7 +1109,7 @@ void Note::relayoutAt(int x, int y, bool animate) cancelAnimation(); setX(x); setY(y); - // But retqlayout others vertically if they are inside such primary groups or if it is a "normal" basket: + // But relayout others vertically if they are inside such primary groups or if it is a "normal" basket: } else { if (animate) setFinalPosition(x, y); @@ -1120,13 +1120,13 @@ void Note::relayoutAt(int x, int y, bool animate) } } - // Then, retqlayout sub-notes (only the first, if the group is folded) and so, assign an height to the group: + // Then, relayout sub-notes (only the first, if the group is folded) and so, assign an height to the group: if (isGroup()) { int h = 0; Note *child = firstChild(); bool first = true; while (child) { - if (child->matching() && (!m_isFolded || first || basket()->isFiltering())) { // Don't use showSubNotes() but use !m_isFolded because we don't want a retqlayout for the animated collapsing notes + if (child->matching() && (!m_isFolded || first || basket()->isFiltering())) { // Don't use showSubNotes() but use !m_isFolded because we don't want a relayout for the animated collapsing notes child->relayoutAt(x + width(), y+h, animate); h += child->finalHeight(); } else // In case the user collapse a group, then move it and then expand it: @@ -1282,7 +1282,7 @@ void drawGradient( TQPainter *p, const TQColor &colorTop, const TQColor & colorB void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &background, bool expand, Basket *basket) { // If the current style is a KStyle, use it to draw the expander (plus or minus): - if (dynamic_cast<KStyle*>(&(kapp->tqstyle())) != NULL) { + if (dynamic_cast<KStyle*>(&(kapp->style())) != NULL) { // Set the 4 rounded corners background to background color: TQColorGroup cg(basket->colorGroup()); cg.setColor(TQColorGroup::Base, background); @@ -1292,7 +1292,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro painter->fillRect(x, y, 9, 9, brush); // Draw it: - ((KStyle&)(kapp->tqstyle())).drawKStylePrimitive( KStyle::KPE_ListViewExpander, + ((KStyle&)(kapp->style())).drawKStylePrimitive( KStyle::KPE_ListViewExpander, painter, basket->viewport(), TQRect(x, y, 9, 9), @@ -2146,7 +2146,7 @@ void Note::recomputeStyle() // unsetWidth(); if (content()) content()->fontChanged(); -// requestRetqlayout(); // TODO! +// requestRelayout(); // TODO! } void Note::recomputeAllStyles() |