OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2002 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2002 Lars Knoll (knoll@kde.org) |
3 * (C) 2002 Dirk Mueller (mueller@kde.org) | 3 * (C) 2002 Dirk Mueller (mueller@kde.org) |
4 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2003, 2006, 2008, 2010 Apple Inc. All rights reserved. |
5 * | 5 * |
6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
9 * version 2 of the License. | 9 * version 2 of the License. |
10 * | 10 * |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 } else if (!effCol || section->primaryCellAt(i, effCol - 1) != c
ell) { | 119 } else if (!effCol || section->primaryCellAt(i, effCol - 1) != c
ell) { |
120 // This spanning cell originates in this column. Insert the
cell into spanning cells list. | 120 // This spanning cell originates in this column. Insert the
cell into spanning cells list. |
121 insertSpanCell(cell); | 121 insertSpanCell(cell); |
122 } | 122 } |
123 } | 123 } |
124 } | 124 } |
125 } | 125 } |
126 | 126 |
127 // Nav/IE weirdness | 127 // Nav/IE weirdness |
128 if (columnLayout.logicalWidth.isFixed()) { | 128 if (columnLayout.logicalWidth.isFixed()) { |
129 if (m_table->document()->inQuirksMode() && columnLayout.maxLogicalWidth
> columnLayout.logicalWidth.value() && fixedContributor != maxContributor) { | 129 if (m_table->document().inQuirksMode() && columnLayout.maxLogicalWidth >
columnLayout.logicalWidth.value() && fixedContributor != maxContributor) { |
130 columnLayout.logicalWidth = Length(); | 130 columnLayout.logicalWidth = Length(); |
131 fixedContributor = 0; | 131 fixedContributor = 0; |
132 } | 132 } |
133 } | 133 } |
134 | 134 |
135 columnLayout.maxLogicalWidth = max(columnLayout.maxLogicalWidth, columnLayou
t.minLogicalWidth); | 135 columnLayout.maxLogicalWidth = max(columnLayout.maxLogicalWidth, columnLayou
t.minLogicalWidth); |
136 } | 136 } |
137 | 137 |
138 void AutoTableLayout::fullRecalc() | 138 void AutoTableLayout::fullRecalc() |
139 { | 139 { |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 | 709 |
710 int pos = 0; | 710 int pos = 0; |
711 for (size_t i = 0; i < nEffCols; ++i) { | 711 for (size_t i = 0; i < nEffCols; ++i) { |
712 m_table->setColumnPosition(i, pos); | 712 m_table->setColumnPosition(i, pos); |
713 pos += m_layoutStruct[i].computedLogicalWidth + m_table->hBorderSpacing(
); | 713 pos += m_layoutStruct[i].computedLogicalWidth + m_table->hBorderSpacing(
); |
714 } | 714 } |
715 m_table->setColumnPosition(m_table->columnPositions().size() - 1, pos); | 715 m_table->setColumnPosition(m_table->columnPositions().size() - 1, pos); |
716 } | 716 } |
717 | 717 |
718 } | 718 } |
OLD | NEW |