kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: fix border rendering for merged cells

Browse Source
This commit is contained in:
Zheng, Lei
2022-06-12 21:49:45 +08:00
committed by Uwe
parent 4d19e611f8
commit 75546946db
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Spreadsheet/App/Sheet.cpp
View File

@@ -850,25 +850,30 @@ Sheet::getCellBinding(Range &range,
return PropertySheet::BindingNone;
}
static inline unsigned _getBorder(
const std::vector<App::Range> &ranges, const App::CellAddress &address)
static inline unsigned _getBorder(const Sheet *sheet,
const std::vector<App::Range> &ranges,
const App::CellAddress &address)
{
unsigned flags = 0;
int rows, cols;
sheet->getSpans(address, rows, cols);
--rows;
--cols;
for(auto &range : ranges) {
auto from = range.from();
auto to = range.to();
if(address.row() < from.row()
|| address.row() > to.row()
|| address.row() + rows > to.row()
|| address.col() < from.col()
|| address.col() > to.col())
|| address.col() + cols > to.col())
continue;
if(address.row() == from.row())
flags |= Sheet::BorderTop;
if(address.row() == to.row())
if(address.row() == to.row() || address.row() + rows == to.row())
flags |= Sheet::BorderBottom;
if(address.col() == from.col())
flags |= Sheet::BorderLeft;
if(address.col() == to.col())
if(address.col() == to.col() || address.col() + cols == to.col())
flags |= Sheet::BorderRight;
if(flags == Sheet::BorderAll)
break;
@@ -877,7 +882,7 @@ static inline unsigned _getBorder(
}
unsigned Sheet::getCellBindingBorder(App::CellAddress address) const {
return _getBorder(boundRanges, address);
return _getBorder(this, boundRanges, address);
}
void Sheet::updateBindings()
@@ -1597,7 +1602,7 @@ unsigned Sheet::getCopyOrCutBorder(CellAddress address, bool copy) const
{
if(hasCopyRange != copy)
return 0;
return _getBorder(copyCutRanges, address);
return _getBorder(this, copyCutRanges, address);
}
///////////////////////////////////////////////////////////////////////////////

2
src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp
View File

@@ -109,7 +109,7 @@ static inline void drawBorder(QPainter *painter, const QStyleOptionViewItem &opt
QRect rect = option.rect.adjusted(1,1,0,0);
if(flags == Sheet::BorderAll) {
painter->drawRect(rect);
painter->drawRect(rect.adjusted(0,0,-1,-1));
return;
}
if(flags & Sheet::BorderLeft)