• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1612 (tree)
Time2021-07-14 14:03:19
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableCellBox.java (revision 1611)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableCellBox.java (revision 1612)
@@ -98,8 +98,7 @@
9898 }
9999
100100 public final void setHeight(double height) {
101- // System.err.println("setInnerHeight:
102- // "+this.height+"/"+height+"/"+this.cutHead);
101+ //System.out.println("setInnerHeight:"+this.height+"/"+height);
103102 assert !StyleUtils.isNone(height);
104103 this.height = height - this.frame.getFrameHeight();
105104 }
--- copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableRowBox.java (revision 1611)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableRowBox.java (revision 1612)
@@ -571,11 +571,13 @@
571571 public final void cutRowspanCells() {
572572 // 連結されたセルを強制切断する
573573 final boolean vertical = StyleUtils.isVertical(this.tableParams.flow);
574+ boolean cut = false;
574575 for (int i = 0; i < this.cells.size(); ++i) {
575576 Cell cell = (Cell) this.cells.get(i);
576577 if (cell.isSource()) {
577578 continue;
578579 }
580+ cut = true;
579581 TableCellBox prevCell = cell.getCellBox();
580582 // 切断面は行の上辺、即ちセルの高さから現在行の高さを引いたもの
581583 Cell sCell = cell.getSource();
@@ -619,6 +621,9 @@
619621 // System.err.println("TR cutRowSpanCells: " + i + "/"
620622 // + prevCell.getHeight());
621623 }
624+ if (!cut) {
625+ return;
626+ }
622627 for (int i = 0; i < this.cells.size(); ++i) {
623628 Cell cell = (Cell) this.cells.get(i);
624629 double rowSize = this.pageSize;
Show on old repository browser