anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Selection painting in Insets (courtesy of fishing industry)

Browse Source 
http://bugzilla.lyx.org/show_bug.cgi?id=5270
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144726.html

Patch by Vincent.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26887 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2008-10-13 23:19:06 +00:00
parent 126711b224
commit b2bb5e5090
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ParagraphMetrics.cpp
View File

@ -104,7 +104,7 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
Dimension const & d = row.dimension();
char_type const b[] = { row.sel_beg, row.sel_end,
row.left_margin_sel, row.right_margin_sel, d.wid, d.asc, d.des};
row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
// Each of the variable to process is 4 bytes: 4x7 = 28
crc.process_bytes(b, 28);

6
src/Row.cpp
View File

@ -29,7 +29,7 @@ namespace lyx {
Row::Row()
: separator(0), label_hfill(0), x(0),
sel_beg(-1), sel_end(-1),
left_margin_sel(false), right_margin_sel(false),
begin_margin_sel(false), end_margin_sel(false),
changed_(false), crc_(0), pos_(0), end_(0)
{}
@ -93,8 +93,8 @@ void Row::setSelectionAndMargins(DocIterator const & beg,
setSelection(beg.pos(), end.pos());
if (selection()) {
right_margin_sel = isMarginSelected(false, beg, end);
left_margin_sel = isMarginSelected(true, beg, end);
end_margin_sel = isMarginSelected(false, beg, end);
begin_margin_sel = isMarginSelected(true, beg, end);
}
}

4
src/Row.h
View File

@ -87,9 +87,9 @@ public:
///
mutable pos_type sel_end;
///
mutable bool left_margin_sel;
mutable bool begin_margin_sel;
///
mutable bool right_margin_sel;
mutable bool end_margin_sel;
private:
/// Decides whether the margin is selected.

39
src/TextMetrics.cpp
View File

@ -2025,9 +2025,9 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co
// whether this row is the first or last and update the margins.
if (row.selection()) {
if (row.sel_beg == 0)
row.left_margin_sel = sel_beg.pit() < pit;
row.begin_margin_sel = sel_beg.pit() < pit;
if (row.sel_end == sel_end_par.lastpos())
row.right_margin_sel = sel_end.pit() > pit;
row.end_margin_sel = sel_end.pit() > pit;
}
// Row signature; has row changed since last paint?
@ -2108,27 +2108,30 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
cur.boundary(begin_boundary);
int x1 = cursorX(beg.top(), begin_boundary);
int x2 = cursorX(end.top(), end_boundary);
int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
int y2 = y1 + row.height();
int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
int const y2 = y1 + row.height();
int const rm = text_->isMainText(buffer) ? bv_->rightMargin() : 0;
int const lm = text_->isMainText(buffer) ? bv_->leftMargin() : 0;
// draw the margins
if (row.left_margin_sel) {
if (row.begin_margin_sel) {
if (text_->isRTL(buffer, beg.paragraph())) {
int const w = width() - bv_->leftMargin() - x1;
pi.pain.fillRectangle(x + x1, y1, w, y2 - y1, Color_selection);
pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1,
Color_selection);
} else {
int const rm = bv_->rightMargin();
pi.pain.fillRectangle(rm, y1, x1 - rm, y2 - y1, Color_selection);
pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1,
Color_selection);
}
}
if (row.right_margin_sel) {
if (row.end_margin_sel) {
if (text_->isRTL(buffer, beg.paragraph())) {
int rm = bv_->rightMargin();
pi.pain.fillRectangle(x + rm, y1, x2 - rm, y2 - y1, Color_selection);
pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
Color_selection);
} else {
int lm = bv_->leftMargin();
pi.pain.fillRectangle(x + x2, y1, width() - lm - x2, y2 - y1, Color_selection);
pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1,
Color_selection);
}
}
@ -2146,13 +2149,13 @@ void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row,
// descend into insets and which does not go into the
// next line. Compare the logic with the original cursorForward
// if left of boundary -> just jump to right side
// but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
// if left of boundary -> just jump to right side, but
// for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
if (cur.boundary()) {
cur.boundary(false);
} else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) {
// in front of RTL boundary -> Stay on this side of the boundary because:
// ab|cDDEEFFghi -> abc|DDEEFFghi
// in front of RTL boundary -> Stay on this side of the boundary
// because: ab|cDDEEFFghi -> abc|DDEEFFghi
++cur.pos();
cur.boundary(true);
drawNow = true;