| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) | 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) |
| 3 * (C) 1997 Torben Weis (weis@kde.org) | 3 * (C) 1997 Torben Weis (weis@kde.org) |
| 4 * (C) 1998 Waldo Bastian (bastian@kde.org) | 4 * (C) 1998 Waldo Bastian (bastian@kde.org) |
| 5 * (C) 1999 Lars Knoll (knoll@kde.org) | 5 * (C) 1999 Lars Knoll (knoll@kde.org) |
| 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 6 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. |
| 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 { | 439 { |
| 440 LayoutState state(*this, locationOffset()); | 440 LayoutState state(*this, locationOffset()); |
| 441 LayoutUnit oldLogicalWidth = logicalWidth(); | 441 LayoutUnit oldLogicalWidth = logicalWidth(); |
| 442 LayoutUnit oldLogicalHeight = logicalHeight(); | 442 LayoutUnit oldLogicalHeight = logicalHeight(); |
| 443 | 443 |
| 444 setLogicalHeight(0); | 444 setLogicalHeight(0); |
| 445 updateLogicalWidth(); | 445 updateLogicalWidth(); |
| 446 | 446 |
| 447 if (logicalWidth() != oldLogicalWidth) { | 447 if (logicalWidth() != oldLogicalWidth) { |
| 448 for (unsigned i = 0; i < m_captions.size(); i++) | 448 for (unsigned i = 0; i < m_captions.size(); i++) |
| 449 layouter.setNeedsLayout(m_captions[i]); | 449 layouter.setNeedsLayout(m_captions[i], LayoutInvalidationReason:
:TableChanged); |
| 450 } | 450 } |
| 451 // FIXME: The optimisation below doesn't work since the internal table | 451 // FIXME: The optimisation below doesn't work since the internal table |
| 452 // layout could have changed. We need to add a flag to the table | 452 // layout could have changed. We need to add a flag to the table |
| 453 // layout that tells us if something has changed in the min max | 453 // layout that tells us if something has changed in the min max |
| 454 // calculations to do it correctly. | 454 // calculations to do it correctly. |
| 455 // if ( oldWidth != width() || columns.size() + 1 != columnPos.size() ) | 455 // if ( oldWidth != width() || columns.size() + 1 != columnPos.size() ) |
| 456 m_tableLayout->layout(); | 456 m_tableLayout->layout(); |
| 457 | 457 |
| 458 LayoutUnit totalSectionLogicalHeight = 0; | 458 LayoutUnit totalSectionLogicalHeight = 0; |
| 459 LayoutUnit oldTableLogicalTop = 0; | 459 LayoutUnit oldTableLogicalTop = 0; |
| (...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel
l* cell) const | 1360 const BorderValue& LayoutTable::tableEndBorderAdjoiningCell(const LayoutTableCel
l* cell) const |
| 1361 { | 1361 { |
| 1362 ASSERT(cell->isFirstOrLastCellInRow()); | 1362 ASSERT(cell->isFirstOrLastCellInRow()); |
| 1363 if (hasSameDirectionAs(cell->row())) | 1363 if (hasSameDirectionAs(cell->row())) |
| 1364 return style()->borderEnd(); | 1364 return style()->borderEnd(); |
| 1365 | 1365 |
| 1366 return style()->borderStart(); | 1366 return style()->borderStart(); |
| 1367 } | 1367 } |
| 1368 | 1368 |
| 1369 } | 1369 } |
| OLD | NEW |