const int ADD_TO_HEIGHT = 2;
const int ADD_TO_TABULAR_WIDTH = 2;
+///
+static LyXTabular * paste_tabular = 0;
+bool InsetTabular::hasPasteBuffer() const
+{
+ return (paste_tabular != 0);
+}
using std::ostream;
using std::ifstream;
struct tabular_features {
- int action;
+ LyXTabular::Feature action;
string feature;
};
{ LyXTabular::M_VALIGN_TOP, "m-valign-top" },
{ LyXTabular::M_VALIGN_BOTTOM, "m-valign-bottom" },
{ LyXTabular::M_VALIGN_CENTER, "m-valign-center" },
- { LyXTabular::DELETE_TABULAR, "delete-tabular" },
{ LyXTabular::MULTICOLUMN, "multicolumn" },
{ LyXTabular::SET_ALL_LINES, "set-all-lines" },
{ LyXTabular::UNSET_ALL_LINES, "unset-all-lines" },
{ LyXTabular::LAST_ACTION, "" }
};
-//#define cellstart(p) ((p % 2) == 0)
+
static inline
bool cellstart(LyXParagraph::size_type p)
{
}
-InsetTabular::InsetTabular(Buffer * buf, int rows, int columns)
- : buffer(buf)
+InsetTabular::InsetTabular(Buffer const & buf, int rows, int columns)
+ : buffer(&buf)
{
if (rows <= 0)
rows = 1;
locked = no_selection = cursor_visible = false;
cursor.x_fix(-1);
oldcell = -1;
- actcell = 0;
+ actrow = actcell = 0;
cursor.pos(0);
- sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
- dialogs_ = 0;
- paste_tabular = 0;
+ clearSelection();
need_update = INIT;
}
-InsetTabular::InsetTabular(InsetTabular const & tab, Buffer * buf)
- : buffer(buf)
+InsetTabular::InsetTabular(InsetTabular const & tab, Buffer const & buf)
+ : buffer(&buf)
{
tabular = new LyXTabular(this, *(tab.tabular));
the_locking_inset = 0;
locked = no_selection = cursor_visible = false;
cursor.x_fix(-1);
oldcell = -1;
- actcell = 0;
+ actrow = actcell = 0;
cursor.pos(0);
sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
- dialogs_ = 0;
- paste_tabular = 0;
need_update = INIT;
}
InsetTabular::~InsetTabular()
{
delete tabular;
- if (dialogs_)
- dialogs_->hideTabular(this);
+ hideDialog();
}
-Inset * InsetTabular::Clone() const
+Inset * InsetTabular::Clone(Buffer const & buf) const
{
- InsetTabular * t = new InsetTabular(*this, buffer);
+ InsetTabular * t = new InsetTabular(*this, buf);
delete t->tabular;
t->tabular = tabular->Clone(t);
return t;
float & x, bool cleared) const
{
Painter & pain = bv->painter();
- int i, j, cell = 0;
+ int i, j;
int nx;
float cx;
- UpdatableInset::draw(bv,font,baseline,x,cleared);
+ UpdatableInset::draw(bv, font, baseline, x, cleared);
if (!cleared && ((need_update == INIT) || (need_update == FULL) ||
(top_x != int(x)) || (top_baseline != baseline))) {
int h = ascent(bv, font) + descent(bv, font);
- int tx = display()||!owner()? 0:top_x;
- int w = tx? width(bv, font):pain.paperWidth();
+ int tx = display() || !owner() ? 0 : top_x;
+ int w = tx ? width(bv, font) : pain.paperWidth();
int ty = baseline - ascent(bv, font);
if (ty < 0)
return;
bool dodraw;
x += ADD_TO_TABULAR_WIDTH;
- if (cleared || (need_update == FULL) || (need_update == CELL)) {
- for(i=0;i<tabular->rows();++i) {
+ if (cleared) {
+ int cell = 0;
+ for (i = 0; i < tabular->rows(); ++i) {
nx = int(x);
- dodraw = ((baseline+tabular->GetDescentOfRow(i)) > 0) &&
- (baseline-tabular->GetAscentOfRow(i)) < pain.paperHeight();
- for(j=0;j<tabular->columns();++j) {
- if (tabular->IsPartOfMultiColumn(i,j))
+ dodraw = ((baseline + tabular->GetDescentOfRow(i)) > 0) &&
+ (baseline - tabular->GetAscentOfRow(i))<pain.paperHeight();
+ for (j = 0; j < tabular->columns(); ++j) {
+ if (tabular->IsPartOfMultiColumn(i, j))
continue;
cx = nx + tabular->GetBeginningOfTextInCell(cell);
- if (hasSelection())
- DrawCellSelection(pain, nx, baseline, i, j, cell);
- if (dodraw && !cleared && locked && the_locking_inset) {
- if (the_locking_inset == tabular->GetCellInset(cell)) {
- LyXText::text_status st = bv->text->status;
- do {
- bv->text->status = st;
- if (need_update == CELL) {
- // clear before the inset
- pain.fillRectangle(
- nx+1,
- baseline - tabular->GetAscentOfRow(i)+1,
- cx - nx - 1,
- tabular->GetAscentOfRow(i) +
- tabular->GetDescentOfRow(i) - 1);
- // clear behind the inset
- pain.fillRectangle(
- cx + the_locking_inset->width(bv,font) + 1,
- baseline - tabular->GetAscentOfRow(i)+1,
- tabular->GetWidthOfColumn(cell) -
- tabular->GetBeginningOfTextInCell(cell) -
- the_locking_inset->width(bv,font) - 1,
- tabular->GetAscentOfRow(i) +
- tabular->GetDescentOfRow(i) - 1);
- }
- tabular->GetCellInset(cell)->draw(
- bv, font, baseline, cx, false);
- } while(bv->text->status == LyXText::CHANGED_IN_DRAW);
- }
- } else if (dodraw) {
+ if (dodraw) {
+ if (hasSelection())
+ DrawCellSelection(pain, nx, baseline, i, j, cell);
tabular->GetCellInset(cell)->draw(bv, font, baseline, cx,
cleared);
DrawCellLines(pain, nx, baseline, i, cell);
++cell;
}
baseline += tabular->GetDescentOfRow(i) +
- tabular->GetAscentOfRow(i+1)+
- tabular->GetAdditionalHeight(cell+1);
+ tabular->GetAscentOfRow(i + 1) +
+ tabular->GetAdditionalHeight(cell);
+ }
+ } else if (need_update == CELL) {
+ int cell = 0;
+ nx = int(x);
+ if (the_locking_inset) {
+ Inset * inset = tabular->GetCellInset(cell);
+ for (i = 0; (inset != the_locking_inset) && (i < tabular->rows());
+ ++i)
+ {
+ for (j = 0; (inset != the_locking_inset) && (j < tabular->columns()); ++j)
+ {
+ if (tabular->IsPartOfMultiColumn(i, j))
+ continue;
+ nx += tabular->GetWidthOfColumn(cell);
+ ++cell;
+ inset = tabular->GetCellInset(cell);
+ }
+ if (tabular->row_of_cell(cell) > i) {
+ nx = int(x);
+ baseline += tabular->GetDescentOfRow(i) +
+ tabular->GetAscentOfRow(i + 1) +
+ tabular->GetAdditionalHeight(cell);
+ }
+ }
+ } else {
+ for (i = 0; (cell < actcell) && (i < tabular->rows()); ++i) {
+ for (j = 0; (cell < actcell) && (j < tabular->columns()); ++j) {
+ if (tabular->IsPartOfMultiColumn(i, j))
+ continue;
+ nx += tabular->GetWidthOfColumn(cell);
+ ++cell;
+ }
+ if (tabular->row_of_cell(cell) > i) {
+ nx = int(x);
+ baseline += tabular->GetDescentOfRow(i) +
+ tabular->GetAscentOfRow(i + 1) +
+ tabular->GetAdditionalHeight(cell);
+ }
+ }
}
+ i = tabular->row_of_cell(cell);
+ if (the_locking_inset != tabular->GetCellInset(cell)) {
+ lyxerr[Debug::INSETS] << "ERROR this shouldn't happen\n";
+ return;
+ }
+#if 0
+ LyXText::text_status st = bv->text->status;
+ do {
+ cx = nx + tabular->GetBeginningOfTextInCell(cell);
+ bv->text->status = st;
+ if (need_update == CELL) {
+ // clear before the inset
+ pain.fillRectangle(
+ nx + 1,
+ baseline - tabular->GetAscentOfRow(i) + 1,
+ int(cx - nx - 1),
+ tabular->GetAscentOfRow(i) +
+ tabular->GetDescentOfRow(i) - 1);
+ // clear behind the inset
+ pain.fillRectangle(
+ int(cx + the_locking_inset->width(bv,font) + 1),
+ baseline - tabular->GetAscentOfRow(i) + 1,
+ tabular->GetWidthOfColumn(cell) -
+ tabular->GetBeginningOfTextInCell(cell) -
+ the_locking_inset->width(bv,font) -
+ tabular->GetAdditionalWidth(cell) - 1,
+ tabular->GetAscentOfRow(i) +
+ tabular->GetDescentOfRow(i) - 1);
+ }
+ tabular->GetCellInset(cell)->draw(bv,font,baseline, cx, false);
+ } while(bv->text->status == LyXText::CHANGED_IN_DRAW);
+#else
+ cx = nx + tabular->GetBeginningOfTextInCell(cell);
+ if (need_update == CELL) {
+ // clear before the inset
+ pain.fillRectangle(
+ nx + 1,
+ baseline - tabular->GetAscentOfRow(i) + 1,
+ int(cx - nx - 1),
+ tabular->GetAscentOfRow(i) +
+ tabular->GetDescentOfRow(i) - 1);
+ // clear behind the inset
+ pain.fillRectangle(
+ int(cx + the_locking_inset->width(bv,font) + 1),
+ baseline - tabular->GetAscentOfRow(i) + 1,
+ tabular->GetWidthOfColumn(cell) -
+ tabular->GetBeginningOfTextInCell(cell) -
+ the_locking_inset->width(bv,font) -
+ tabular->GetAdditionalWidth(cell) - 1,
+ tabular->GetAscentOfRow(i) +
+ tabular->GetDescentOfRow(i) - 1);
+ }
+ tabular->GetCellInset(cell)->draw(bv,font,baseline, cx, false);
+ if (bv->text->status == LyXText::CHANGED_IN_DRAW)
+ return;
+#endif
}
x -= ADD_TO_TABULAR_WIDTH;
x += width(bv, font);
on_off = !tabular->TopLine(cell);
pain.line(x, baseline - tabular->GetAscentOfRow(row),
x2, baseline - tabular->GetAscentOfRow(row),
- on_off ? LColor::tabularonoffline:LColor::tabularline,
- on_off ? Painter::line_onoffdash:Painter::line_solid);
+ on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular->BottomLine(cell);
pain.line(x,baseline + tabular->GetDescentOfRow(row),
x2, baseline + tabular->GetDescentOfRow(row),
- on_off ? LColor::tabularonoffline:LColor::tabularline,
- on_off ? Painter::line_onoffdash:Painter::line_solid);
+ on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? Painter::line_onoffdash : Painter::line_solid);
if (!tabular->LeftAlreadyDrawed(cell)) {
on_off = !tabular->LeftLine(cell);
pain.line(x, baseline - tabular->GetAscentOfRow(row),
x, baseline + tabular->GetDescentOfRow(row),
- on_off ? LColor::tabularonoffline:LColor::tabularline,
- on_off ? Painter::line_onoffdash:Painter::line_solid);
+ on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? Painter::line_onoffdash : Painter::line_solid);
}
on_off = !tabular->RightLine(cell);
pain.line(x2 - tabular->GetAdditionalWidth(cell),
baseline - tabular->GetAscentOfRow(row),
x2 - tabular->GetAdditionalWidth(cell),
baseline + tabular->GetDescentOfRow(row),
- on_off ? LColor::tabularonoffline:LColor::tabularline,
- on_off ? Painter::line_onoffdash:Painter::line_solid);
+ on_off ? LColor::tabularonoffline : LColor::tabularline,
+ on_off ? Painter::line_onoffdash : Painter::line_solid);
}
owner()->update(bv, font, true);
return;
}
- if (the_locking_inset)
+ if (the_locking_inset) {
the_locking_inset->update(bv, font, reinit);
- switch(need_update) {
+// resetPos(bv);
+// inset_x = cursor.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
+// inset_y = cursor.y();
+ }
+ switch (need_update) {
case INIT:
case FULL:
case CELL:
}
-char const * InsetTabular::EditMessage() const
+string const InsetTabular::EditMessage() const
{
return _("Opened Tabular Inset");
}
}
locked = true;
the_locking_inset = 0;
- inset_pos = inset_x = inset_y = 0;
+ inset_pos = 0;
+ inset_x = 0;
+ inset_y = 0;
setPos(bv, x, y);
sel_pos_start = sel_pos_end = cursor.pos();
sel_cell_start = sel_cell_end = actcell;
if (InsetHit(bv, x, y)) {
ActivateCellInset(bv, x, y, button);
}
- UpdateLocal(bv, NONE, false);
+// UpdateLocal(bv, NONE, false);
// bv->getOwner()->getPopups().updateFormTabular();
}
locked = false;
if (scroll() || hasSelection()) {
if (scroll()) {
- scroll(bv, (float)0.0);
+ scroll(bv, 0.0F);
} else {
sel_pos_start = sel_pos_end = 0;
sel_cell_start = sel_cell_end = 0;
void InsetTabular::UpdateLocal(BufferView * bv, UpdateCodes what,
bool mark_dirty) const
{
- need_update = what;
- bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
- if (locked && (what != NONE))
- resetPos(bv);
+ if (need_update < what) // only set this if it has greater update
+ need_update = what;
+ // Dirty Cast! (Lgb)
+ if (need_update != NONE) {
+ bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
+ if (locked) // && (what != NONE))
+ resetPos(bv);
+ }
}
the_locking_inset = 0;
if (lr)
moveRight(bv, false);
+ ShowInsetCursor(bv, false);
UpdateLocal(bv, CELL, false);
return true;
}
if (the_locking_inset->UnlockInsetInInset(bv, inset, lr)) {
- if ((inset->LyxCode() == TABULAR_CODE) &&
+ if (inset->LyxCode() == TABULAR_CODE &&
!the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE))
{
- dialogs_ = bv->owner()->getDialogs();
- dialogs_->updateTabular(const_cast<InsetTabular *>(this));
- oldcell = actcell;
+ bv->owner()->getDialogs()->updateTabular(this);
+ oldcell = actcell;
}
return true;
}
{
if (!the_locking_inset)
return false;
- if (the_locking_inset != inset)
- return the_locking_inset->UpdateInsetInInset(bv, inset);
+ if (the_locking_inset != inset) {
+ if (!the_locking_inset->UpdateInsetInInset(bv, inset))
+ return false;
+ }
UpdateLocal(bv, CELL, false);
return true;
}
-int InsetTabular::InsetInInsetY()
+unsigned int InsetTabular::InsetInInsetY()
{
if (!the_locking_inset)
return 0;
void InsetTabular::InsetButtonPress(BufferView * bv, int x, int y, int button)
{
- if (hasSelection()) {
- sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
+ if (hasSelection() && (button != 3)) {
+ clearSelection();
UpdateLocal(bv, SELECTION, false);
}
no_selection = false;
- int ocell = actcell;
- int orow = actrow;
+ int const ocell = actcell;
+ int const orow = actrow;
HideInsetCursor(bv);
setPos(bv, x, y);
sel_pos_start = sel_pos_end = cursor.pos();
sel_cell_start = sel_cell_end = actcell;
- bool inset_hit = InsetHit(bv, x, y);
+ bool const inset_hit = InsetHit(bv, x, y);
if ((ocell == actcell) && the_locking_inset && inset_hit) {
- the_locking_inset->InsetButtonPress(bv, x-inset_x, y-inset_y, button);
+ cursor.pos(0); // always before the inset!
+ resetPos(bv);
+ the_locking_inset->InsetButtonPress(bv,
+ x - inset_x, y - inset_y, button);
return;
} else if (the_locking_inset) {
the_locking_inset->InsetUnlock(bv);
}
the_locking_inset = 0;
- if (inset_hit && bv->the_locking_inset) {
- ActivateCellInset(bv, x, y, button);
- the_locking_inset->InsetButtonPress(bv, x-inset_x, y-inset_y, button);
+ if (inset_hit && bv->theLockingInset()) {
+ if (ActivateCellInset(bv, x, y, button))
+ the_locking_inset->InsetButtonPress(bv, x - inset_x,
+ y - inset_y, button);
return;
}
ShowInsetCursor(bv);
return;
}
}
- dialogs_ = bv->owner()->getDialogs();
- dialogs_->showTabular(this);
+ bv->owner()->getDialogs()->showTabular(this);
return;
}
if (the_locking_inset) {
}
if (!no_selection) {
HideInsetCursor(bv);
- int old_pos = sel_pos_end;
- int old_cell = actcell;
+ LyXParagraph::size_type const old_pos = sel_pos_end;
+ int const old_cell = actcell;
setPos(bv, x, y);
sel_pos_end = cursor.pos();
sel_pos_start = sel_pos_end = cursor.pos();
sel_cell_start = sel_cell_end = actcell;
the_locking_inset=0;
+ ShowInsetCursor(bv);
result = DISPATCHED;
return result;
}
HideInsetCursor(bv);
result=DISPATCHED;
switch (action) {
- // Normal chars not handled here
- case -1:
- break;
// --- Cursor Movements ---------------------------------------------
case LFUN_RIGHTSEL:
if (tabular->IsLastCellInRow(actcell) && !cellstart(cursor.pos()))
break;
moveRight(bv, false);
- sel_pos_end = cursor.pos();
+#if 0
if (!cellstart(cursor.pos())) {
+ sel_pos_end = cursor.pos();
if (tabular->right_column_of_cell(sel_cell_start) >
tabular->right_column_of_cell(actcell))
sel_cell_end = actcell+1;
else
sel_cell_end = actcell;
}
+#else
+ sel_pos_end = cursor.pos();
+ sel_cell_end = actcell;
+#endif
UpdateLocal(bv, SELECTION, false);
break;
case LFUN_RIGHT:
if (tabular->IsFirstCellInRow(actcell) && cellstart(cursor.pos()))
break;
moveLeft(bv, false);
- sel_pos_end = cursor.pos();
+#if 0
if (cellstart(cursor.pos())) {
+ sel_pos_end = cursor.pos();
if (tabular->column_of_cell(sel_cell_start) >=
tabular->column_of_cell(actcell))
sel_cell_end = actcell;
else
sel_cell_end = actcell-1;
}
+#else
+ sel_pos_end = cursor.pos();
+ sel_cell_end = actcell;
+#endif
UpdateLocal(bv, SELECTION, false);
break;
case LFUN_LEFT:
break;
case LFUN_DOWNSEL:
{
- int ocell = actcell;
+ int const ocell = actcell;
moveDown(bv);
sel_pos_end = cursor.pos();
if ((ocell == sel_cell_end) ||
}
break;
case LFUN_DOWN:
- result= moveDown(bv);
+ result = moveDown(bv);
sel_pos_start = sel_pos_end = cursor.pos();
sel_cell_start = sel_cell_end = actcell;
if (hs)
break;
case LFUN_UPSEL:
{
- int ocell = actcell;
+ int const ocell = actcell;
moveUp(bv);
sel_pos_end = cursor.pos();
if ((ocell == sel_cell_end) ||
}
break;
case LFUN_UP:
- result= moveUp(bv);
+ result = moveUp(bv);
sel_pos_start = sel_pos_end = cursor.pos();
sel_cell_start = sel_cell_end = actcell;
if (hs)
if (hs)
UpdateLocal(bv, SELECTION, false);
break;
- case LFUN_LAYOUT_TABLE:
+ case LFUN_LAYOUT_TABULAR:
{
- dialogs_ = bv->owner()->getDialogs();
- dialogs_->showTabular(this);
+ bv->owner()->getDialogs()->showTabular(this);
}
break;
case LFUN_TABULAR_FEATURE:
result = UNDISPATCHED;
break;
case LFUN_CUT:
- if (!copySelection())
+ if (!copySelection(bv))
break;
bv->text->SetUndo(bv->buffer(), Undo::DELETE,
#ifndef NEW_INSETS
if (!hasSelection())
break;
bv->text->FinishUndo();
- copySelection();
+ copySelection(bv);
break;
case LFUN_PASTE:
if (!hasPasteBuffer())
UpdateLocal(bv, INIT, true);
break;
default:
+ // we try to activate the actual inset and put this event down to
+ // the insets dispatch function.
result = UNDISPATCHED;
+ if (the_locking_inset)
+ break;
+ if (ActivateCellInset(bv, 0, 0, 0, !cellstart(cursor.pos()))) {
+ result=the_locking_inset->LocalDispatch(bv, action, arg);
+ if (result == DISPATCHED_NOUPDATE)
+ return result;
+ else if (result == DISPATCHED) {
+ the_locking_inset->ToggleInsetCursor(bv);
+ UpdateLocal(bv, CELL, false);
+ the_locking_inset->ToggleInsetCursor(bv);
+ return result;
+ } else {
+ result = UNDISPATCHED;
+ }
+ }
break;
}
if (result!=FINISHED) {
if (!the_locking_inset) {
-#if 0
- if (ocell != actcell)
- bview->getOwner()->getPopups().updateFormTabular();
-#endif
ShowInsetCursor(bv);
}
} else
}
-int InsetTabular::Ascii(Buffer const *, ostream &) const
+int InsetTabular::Ascii(Buffer const * buf, ostream & os, int) const
{
- return 0;
+ // This should be changed to a real ascii export
+ return tabular->Ascii(buf, os);
}
}
-int InsetTabular::DocBook(Buffer const *, ostream &) const
+int InsetTabular::DocBook(Buffer const * buf, ostream & os) const
{
- return 0;
+ return tabular->DocBook(buf,os);
}
InsetText * inset;
bool changed = false;
- for(int i = 0; i < tabular->rows(); ++i) {
+ // if we have a locking_inset we should have to check only this cell for
+ // change so I'll try this to have a boost, but who knows ;)
+ if ((need_update != INIT) &&
+ (the_locking_inset == tabular->GetCellInset(actcell))) {
+ maxAsc = the_locking_inset->ascent(bv, font);
+ maxDesc = the_locking_inset->descent(bv, font);
+ changed = tabular->SetWidthOfCell(actcell, the_locking_inset->width(bv, font));
+ changed = tabular->SetAscentOfRow(actrow, maxAsc + ADD_TO_HEIGHT) || changed;
+ changed = tabular->SetDescentOfRow(actrow, maxDesc + ADD_TO_HEIGHT) || changed;
+ return changed;
+ }
+ for (int i = 0; i < tabular->rows(); ++i) {
maxAsc = maxDesc = 0;
- for(int j= 0; j < tabular->columns(); ++j) {
+ for (int j= 0; j < tabular->columns(); ++j) {
if (tabular->IsPartOfMultiColumn(i,j))
continue;
++cell;
}
-void InsetTabular::GetCursorPos(BufferView *, int & x, int & y) const
+void InsetTabular::GetCursorPos(BufferView *,
+ int & x, int & y) const
{
x = cursor.x() - top_x;
y = cursor.y();
LyXFont font; // = the_locking_inset->GetFont(par, cursor.pos);
- int asc = lyxfont::maxAscent(font);
- int desc = lyxfont::maxDescent(font);
+ int const asc = lyxfont::maxAscent(font);
+ int const desc = lyxfont::maxDescent(font);
if (cursor_visible)
bv->hideLockedInsetCursor();
}
-void InsetTabular::ShowInsetCursor(BufferView * bv)
+void InsetTabular::ShowInsetCursor(BufferView * bv, bool show)
{
if (!cursor_visible) {
LyXFont font; // = GetFont(par, cursor.pos);
- int asc = lyxfont::maxAscent(font);
- int desc = lyxfont::maxDescent(font);
+ int const asc = lyxfont::maxAscent(font);
+ int const desc = lyxfont::maxDescent(font);
bv->fitLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
- bv->showLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
+ if (show)
+ bv->showLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
cursor_visible = true;
}
}
// first search the right row
while((ly < y) && (actrow < tabular->rows())) {
cursor.y(cursor.y() + tabular->GetDescentOfRow(actrow) +
- tabular->GetAscentOfRow(actrow+1) +
+ tabular->GetAscentOfRow(actrow + 1) +
tabular->GetAdditionalHeight(tabular->GetCellNumber(actrow + 1,
actcol)));
++actrow;
// now search the right column
int lx = tabular->GetWidthOfColumn(actcell) -
tabular->GetAdditionalWidth(actcell);
- for(; !tabular->IsLastCellInRow(actcell) && (lx < x);
+#if 0
+#warning Jürgen, can you rewrite this to _not_ use the sequencing operator. (Lgb)
+ for (; !tabular->IsLastCellInRow(actcell) && (lx < x);
++actcell,lx += tabular->GetWidthOfColumn(actcell) +
tabular->GetAdditionalWidth(actcell - 1));
+#else
+ // Jürgen, you should check that this is correct. (Lgb)
+ for (; !tabular->IsLastCellInRow(actcell) && lx < x; ++actcell) {
+ lx += tabular->GetWidthOfColumn(actcell + 1)
+ + tabular->GetAdditionalWidth(actcell);
+ }
+
+#endif
cursor.pos(0);
resetPos(bv);
- if ((lx - (tabular->GetWidthOfColumn(actcell)/2)) < x) {
+ if ((lx - (tabular->GetWidthOfColumn(actcell) / 2)) < x) {
cursor.x(lx + top_x - 2);
cursor.pos(1);
} else {
int InsetTabular::getCellXPos(int cell) const
{
- int c;
+ int c = cell;
- for(c=cell;!tabular->IsFirstCellInRow(c);--c)
+ for (; !tabular->IsFirstCellInRow(c); --c)
;
int lx = tabular->GetWidthOfColumn(cell);
- for(; (c < cell); ++c) {
+ for (; c < cell; ++c) {
lx += tabular->GetWidthOfColumn(c);
}
return (lx - tabular->GetWidthOfColumn(cell) + top_x);
int cell = 0;
actrow = 0;
cursor.y(0);
- for(; (cell<actcell) && !tabular->IsLastRow(cell); ++cell) {
+ for (; (cell < actcell) && !tabular->IsLastRow(cell); ++cell) {
if (tabular->IsLastCellInRow(cell)) {
cursor.y(cursor.y() + tabular->GetDescentOfRow(actrow) +
tabular->GetAscentOfRow(actrow + 1) +
++actrow;
}
}
- static int offset = ADD_TO_TABULAR_WIDTH + 2;
- cursor.x(getCellXPos(actcell) + offset);
+ static int const offset = ADD_TO_TABULAR_WIDTH + 2;
+ int new_x = getCellXPos(actcell);
+ new_x += offset;
+ cursor.x(new_x);
+// cursor.x(getCellXPos(actcell) + offset);
if (((cursor.x() - offset) > 20) &&
((cursor.x()-offset+tabular->GetWidthOfColumn(actcell)) >
(bv->workWidth()-20)))
if ((!the_locking_inset ||
!the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE)) &&
(actcell != oldcell)) {
- dialogs_ = bv->owner()->getDialogs();
- dialogs_->updateTabular(const_cast<InsetTabular *>(this));
- oldcell = actcell;
+ InsetTabular * inset = const_cast<InsetTabular *>(this);
+ bv->owner()->getDialogs()->updateTabular(inset);
+ oldcell = actcell;
}
}
if (tabular->IsLastCell(actcell))
return FINISHED;
++actcell;
- cursor.pos((cursor.pos() + 1) % 2);
+ cursor.pos(0);
} else if (lock) {
if (ActivateCellInset(bv))
return DISPATCHED;
} else { // before the inset
- cursor.pos((cursor.pos() + 1) % 2);
+ cursor.pos(1);
}
resetPos(bv);
return DISPATCHED_NOUPDATE;
UpdatableInset::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
{
- if (!cursor.pos()) {
- if (!actcell)
- return FINISHED;
- cursor.pos(0);
- }
- cursor.pos((cursor.pos() - 1) % 2);
- if (!cellstart(cursor.pos())) {
+ if (cellstart(cursor.pos()) && !actcell)
+ return FINISHED;
+ if (cellstart(cursor.pos())) {
--actcell;
+ cursor.pos(1);
} else if (lock) { // behind the inset
+ cursor.pos(0);
if (ActivateCellInset(bv, 0, 0, 0, true))
return DISPATCHED;
+ } else {
+ cursor.pos(0);
}
resetPos(bv);
return DISPATCHED_NOUPDATE;
UpdatableInset::RESULT InsetTabular::moveUp(BufferView * bv)
{
- int ocell = actcell;
+ int const ocell = actcell;
actcell = tabular->GetCellAbove(actcell);
if (actcell == ocell) // we moved out of the inset
return FINISHED;
UpdatableInset::RESULT InsetTabular::moveDown(BufferView * bv)
{
- int ocell = actcell;
+ int const ocell = actcell;
actcell = tabular->GetCellBelow(actcell);
if (actcell == ocell) // we moved out of the inset
return FINISHED;
if (tabular->IsLastCell(actcell))
return false;
++actcell;
- cursor.pos((cursor.pos() + 1) % 2);
- if (!cellstart(cursor.pos()))
- cursor.pos((cursor.pos() + 1) % 2);
resetPos(bv);
return true;
}
if (!actcell) // first cell
return false;
--actcell;
- cursor.pos((cursor.pos() - 1) % 2);
- if (cellstart(cursor.pos()))
- cursor.pos((cursor.pos() - 1) % 2);
resetPos(bv);
return true;
}
}
-bool InsetTabular::TabularFeatures(BufferView * bv, string what)
+bool InsetTabular::TabularFeatures(BufferView * bv, string const & what)
{
- int action = LyXTabular::LAST_ACTION;
- string val;
- int i;
-
- for(i=0; tabularFeatures[i].action != LyXTabular::LAST_ACTION; ++i) {
- if (!strncmp(tabularFeatures[i].feature.c_str(), what.c_str(),
- tabularFeatures[i].feature.length())) {
+ LyXTabular::Feature action = LyXTabular::LAST_ACTION;
+
+ int i = 0;
+ for (; tabularFeatures[i].action != LyXTabular::LAST_ACTION; ++i) {
+ string const tmp = tabularFeatures[i].feature;
+
+ if (tmp == what.substr(0, tmp.length())) {
+ //if (!strncmp(tabularFeatures[i].feature.c_str(), what.c_str(),
+ //tabularFeatures[i].feature.length())) {
action = tabularFeatures[i].action;
break;
}
if (action == LyXTabular::LAST_ACTION)
return false;
- val = frontStrip(what.substr(tabularFeatures[i].feature.length()));
+ string const val =
+ frontStrip(what.substr(tabularFeatures[i].feature.length()));
TabularFeatures(bv, action, val);
return true;
}
-void InsetTabular::TabularFeatures(BufferView * bv, int feature, string value)
+void InsetTabular::TabularFeatures(BufferView * bv,
+ LyXTabular::Feature feature,
+ string const & value)
{
- int
- i, j,
- sel_col_start,
- sel_col_end,
- sel_row_start,
- sel_row_end,
- setLines = 0,
- setAlign = LYX_ALIGN_LEFT,
- lineSet;
- bool
- what;
+ int i;
+ int j;
+ int sel_col_start;
+ int sel_col_end;
+ int sel_row_start;
+ int sel_row_end;
+ int setLines = 0;
+ LyXAlignment setAlign = LYX_ALIGN_LEFT;
+ LyXTabular::VAlignment setVAlign = LyXTabular::LYX_VALIGN_TOP;
+ int lineSet;
+ bool what;
switch (feature) {
case LyXTabular::M_ALIGN_LEFT:
break;
case LyXTabular::M_VALIGN_TOP:
case LyXTabular::VALIGN_TOP:
- setAlign=LyXTabular::LYX_VALIGN_TOP;
+ setVAlign=LyXTabular::LYX_VALIGN_TOP;
break;
case LyXTabular::M_VALIGN_BOTTOM:
case LyXTabular::VALIGN_BOTTOM:
- setAlign=LyXTabular::LYX_VALIGN_BOTTOM;
+ setVAlign=LyXTabular::LYX_VALIGN_BOTTOM;
break;
case LyXTabular::M_VALIGN_CENTER:
case LyXTabular::VALIGN_CENTER:
- setAlign=LyXTabular::LYX_VALIGN_CENTER;
+ setVAlign=LyXTabular::LYX_VALIGN_CENTER;
break;
default:
break;
}
if (hasSelection()) {
- int tmp;
sel_col_start = tabular->column_of_cell(sel_cell_start);
sel_col_end = tabular->column_of_cell(sel_cell_end);
if (sel_col_start > sel_col_end) {
sel_row_start = tabular->row_of_cell(sel_cell_start);
sel_row_end = tabular->row_of_cell(sel_cell_end);
if (sel_row_start > sel_row_end) {
- tmp = sel_row_start;
- sel_row_start = sel_row_end;
- sel_row_end = tmp;
+ //int tmp = sel_row_start;
+ //sel_row_start = sel_row_end;
+ //sel_row_end = tmp;
+ swap(sel_row_start, sel_row_end);
}
} else {
sel_col_start = sel_col_end = tabular->column_of_cell(actcell);
switch (feature) {
case LyXTabular::SET_PWIDTH:
{
- bool update = (tabular->GetColumnPWidth(actcell) != value);
+ bool const update = (tabular->GetColumnPWidth(actcell) != value);
tabular->SetColumnPWidth(actcell,value);
if (update) {
for (int i=0; i < tabular->rows(); ++i) {
break;
case LyXTabular::SET_MPWIDTH:
{
- bool update = (tabular->GetPWidth(actcell) != value);
+ bool const update = (tabular->GetPWidth(actcell) != value);
tabular->SetMColumnPWidth(actcell,value);
if (update) {
for (int i=0; i < tabular->rows(); ++i) {
if ((row+1) > tabular->rows())
--row;
actcell = tabular->GetCellNumber(row, column);
+ clearSelection();
UpdateLocal(bv, INIT, true);
break;
case LyXTabular::DELETE_COLUMN:
if ((column+1) > tabular->columns())
--column;
actcell = tabular->GetCellNumber(row, column);
+ clearSelection();
UpdateLocal(bv, INIT, true);
break;
case LyXTabular::M_TOGGLE_LINE_TOP:
flag = false;
case LyXTabular::TOGGLE_LINE_TOP:
lineSet = !tabular->TopLine(actcell, flag);
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetTopLine(tabular->GetCellNumber(i,j),lineSet, flag);
UpdateLocal(bv, INIT, true);
break;
flag = false;
case LyXTabular::TOGGLE_LINE_BOTTOM:
lineSet = !tabular->BottomLine(actcell, flag);
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetBottomLine(tabular->GetCellNumber(i,j),lineSet,
flag);
UpdateLocal(bv, INIT, true);
flag = false;
case LyXTabular::TOGGLE_LINE_LEFT:
lineSet = !tabular->LeftLine(actcell, flag);
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetLeftLine(tabular->GetCellNumber(i,j),lineSet,
flag);
UpdateLocal(bv, INIT, true);
flag = false;
case LyXTabular::TOGGLE_LINE_RIGHT:
lineSet = !tabular->RightLine(actcell, flag);
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetRightLine(tabular->GetCellNumber(i,j),lineSet,
flag);
UpdateLocal(bv, INIT, true);
case LyXTabular::ALIGN_LEFT:
case LyXTabular::ALIGN_RIGHT:
case LyXTabular::ALIGN_CENTER:
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
- tabular->SetAlignment(tabular->GetCellNumber(i,j),setAlign,
+ for (i = sel_row_start; i <= sel_row_end; ++i)
+ for (j = sel_col_start; j <= sel_col_end; ++j)
+ tabular->SetAlignment(tabular->GetCellNumber(i, j), setAlign,
flag);
if (hasSelection())
UpdateLocal(bv, INIT, true);
case LyXTabular::VALIGN_TOP:
case LyXTabular::VALIGN_BOTTOM:
case LyXTabular::VALIGN_CENTER:
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
- tabular->SetVAlignment(tabular->GetCellNumber(i,j), setAlign,
- flag);
+ for (i = sel_row_start; i <= sel_row_end; ++i)
+ for (j = sel_col_start; j <= sel_col_end; ++j)
+ tabular->SetVAlignment(tabular->GetCellNumber(i, j),
+ setVAlign, flag);
if (hasSelection())
UpdateLocal(bv, INIT, true);
else
}
// we have a selection so this means we just add all this
// cells to form a multicolumn cell
- int
- s_start, s_end;
+ int s_start;
+ int s_end;
if (sel_cell_start > sel_cell_end) {
s_start = sel_cell_end;
case LyXTabular::SET_ALL_LINES:
setLines = 1;
case LyXTabular::UNSET_ALL_LINES:
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetAllLines(tabular->GetCellNumber(i,j), setLines);
UpdateLocal(bv, INIT, true);
break;
tabular->SetRotateTabular(false);
break;
case LyXTabular::SET_ROTATE_CELL:
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
+ for (i=sel_row_start; i<=sel_row_end; ++i)
+ for (j=sel_col_start; j<=sel_col_end; ++j)
tabular->SetRotateCell(tabular->GetCellNumber(i,j),true);
break;
case LyXTabular::UNSET_ROTATE_CELL:
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
- tabular->SetRotateCell(tabular->GetCellNumber(i,j),false);
+ for (i = sel_row_start; i <= sel_row_end; ++i)
+ for (j = sel_col_start; j <= sel_col_end; ++j)
+ tabular->SetRotateCell(tabular->GetCellNumber(i, j), false);
break;
case LyXTabular::SET_USEBOX:
{
- LyXTabular::BoxType val = static_cast<LyXTabular::BoxType>
- (strToInt(value));
+ LyXTabular::BoxType val = LyXTabular::BoxType(strToInt(value));
if (val == tabular->GetUsebox(actcell))
val = LyXTabular::BOX_NONE;
- for(i=sel_row_start; i<=sel_row_end; ++i)
- for(j=sel_col_start; j<=sel_col_end; ++j)
- tabular->SetUsebox(tabular->GetCellNumber(i,j),val);
+ for (i = sel_row_start; i <= sel_row_end; ++i)
+ for (j = sel_col_start; j <= sel_col_end; ++j)
+ tabular->SetUsebox(tabular->GetCellNumber(i, j), val);
break;
}
case LyXTabular::SET_LTFIRSTHEAD:
- tabular->SetLTHead(actcell,true);
+ tabular->SetLTHead(actcell, true);
break;
case LyXTabular::SET_LTHEAD:
- tabular->SetLTHead(actcell,false);
+ tabular->SetLTHead(actcell, false);
break;
case LyXTabular::SET_LTFOOT:
- tabular->SetLTFoot(actcell,false);
+ tabular->SetLTFoot(actcell, false);
break;
case LyXTabular::SET_LTLASTFOOT:
- tabular->SetLTFoot(actcell,true);
+ tabular->SetLTFoot(actcell, true);
break;
case LyXTabular::SET_LTNEWPAGE:
what = !tabular->GetLTNewPage(actcell);
- tabular->SetLTNewPage(actcell,what);
+ tabular->SetLTNewPage(actcell, what);
+ break;
+ // dummy stuff just to avoid warnings
+ case LyXTabular::LAST_ACTION:
break;
}
}
// the cursor.pos has to be before the inset so if it isn't now just
// reset the curor pos first!
if (!cellstart(cursor.pos())) {
- cursor.pos((cursor.pos() - 1) % 2);
+ cursor.pos(0);
resetPos(bv);
}
UpdatableInset * inset =
if (!the_locking_inset)
return false;
UpdateLocal(bv, CELL, false);
- return true;
+ return (the_locking_inset != 0);
}
bool InsetTabular::InsetHit(BufferView * bv, int x, int ) const
{
InsetText * inset = tabular->GetCellInset(actcell);
- int x1 = x + top_x;
+ int const x1 = x + top_x;
if (!cellstart(cursor.pos())) {
- return (((x + top_x) < cursor.x()) &&
- ((x + top_x) > (cursor.x() - inset->width(bv,
- LyXFont(LyXFont::ALL_SANE)))));
+ return ((x + top_x) < cursor.x() &&
+ (x + top_x) > (cursor.x() - inset->width(bv,
+ LyXFont(LyXFont::ALL_SANE))));
} else {
- int x2 = cursor.x() + tabular->GetBeginningOfTextInCell(actcell);
- return ((x1 > x2) &&
- (x1 < (x2 + inset->width(bv, LyXFont(LyXFont::ALL_SANE)))));
+ int const x2 = cursor.x() + tabular->GetBeginningOfTextInCell(actcell);
+ return (x1 > x2 &&
+ x1 < (x2 + inset->width(bv, LyXFont(LyXFont::ALL_SANE))));
}
}
// in pixels if we have a pwidth for this cell.
int InsetTabular::GetMaxWidthOfCell(Painter &, int cell) const
{
- string s = tabular->GetPWidth(cell);
+ string const s = tabular->GetPWidth(cell);
if (s.empty())
return -1;
- return VSpace(s).inPixels( 0, 0);
+ return VSpace(s).inPixels(0, 0);
}
int InsetTabular::getMaxWidth(Painter & pain,
UpdatableInset const * inset) const
{
- int cell;
- int n = tabular->GetNumberOfCells();
- for(cell=0; cell < n; ++cell) {
+ int const n = tabular->GetNumberOfCells();
+ int cell = 0;
+ for (; cell < n; ++cell) {
if (tabular->GetCellInset(cell) == inset)
break;
}
need_update = FULL;
}
+
LyXText * InsetTabular::getLyXText(BufferView * bv) const
{
if (the_locking_inset)
return;
}
}
- dialogs_ = bv->owner()->getDialogs();
- dialogs_->showTabular(const_cast<InsetTabular *>(this));
+ bv->owner()->getDialogs()->showTabular(const_cast<InsetTabular *>(this));
}
//
// 2 ... toggled on
// 3 ... toggled off
//
-LyXFunc::func_status InsetTabular::getStatus(string what) const
+LyXFunc::func_status InsetTabular::getStatus(string const & what) const
{
int action = LyXTabular::LAST_ACTION;
- string argument;
- int i;
LyXFunc::func_status status = LyXFunc::OK;
- for(i=0; tabularFeatures[i].action != LyXTabular::LAST_ACTION; ++i) {
- if (!strncmp(tabularFeatures[i].feature.c_str(), what.c_str(),
- tabularFeatures[i].feature.length())) {
+ int i = 0;
+ for (; tabularFeatures[i].action != LyXTabular::LAST_ACTION; ++i) {
+ string const tmp = tabularFeatures[i].feature;
+ if (tmp == what.substr(0, tmp.length())) {
+ //if (!strncmp(tabularFeatures[i].feature.c_str(), what.c_str(),
+ // tabularFeatures[i].feature.length())) {
action = tabularFeatures[i].action;
break;
}
if (action == LyXTabular::LAST_ACTION)
return LyXFunc::Unknown;
- argument = frontStrip(what.substr(tabularFeatures[i].feature.length()));
+ string const argument = frontStrip(what.substr(tabularFeatures[i].feature.length()));
int sel_row_start, sel_row_end;
int dummy;
bool flag = true;
if (hasSelection()) {
- int tmp;
sel_row_start = tabular->row_of_cell(sel_cell_start);
sel_row_end = tabular->row_of_cell(sel_cell_end);
if (sel_row_start > sel_row_end) {
- tmp = sel_row_start;
- sel_row_start = sel_row_end;
- sel_row_end = tmp;
+ //int tmp = sel_row_start;
+ //sel_row_start = sel_row_end;
+ //sel_row_end = tmp;
+ swap(sel_row_start, sel_row_end);
}
} else {
sel_row_start = sel_row_end = tabular->row_of_cell(actcell);
}
-bool InsetTabular::copySelection()
+bool InsetTabular::copySelection(BufferView * bv)
{
if (!hasSelection())
return false;
sel_row_start = tabular->row_of_cell(sel_cell_start);
sel_row_end = tabular->row_of_cell(sel_cell_end);
if (sel_row_start > sel_row_end) {
- int tmp;
- tmp = sel_row_start;
- sel_row_start = sel_row_end;
- sel_row_end = tmp;
+ //int tmp tmp = sel_row_start;
+ //sel_row_start = sel_row_end;
+ //sel_row_end = tmp;
+ swap(sel_row_start, sel_row_end);
}
int rows = sel_row_end - sel_row_start + 1;
- paste_tabular = new LyXTabular(this, rows, columns);
-
- if (sel_cell_start > sel_cell_end) {
- int tmp = sel_cell_start;
- sel_cell_start = sel_cell_end;
- sel_cell_end = tmp;
- }
- for(int i=sel_cell_start, j=0; i <= sel_cell_end; ++i, ++j) {
- while(paste_tabular->row_of_cell(j) <
- (tabular->row_of_cell(i)-sel_row_start)) {
- ++j;
- }
- while(paste_tabular->row_of_cell(j) >
- (tabular->row_of_cell(i)-sel_row_start)) {
- ++i;
- }
- *(paste_tabular->GetCellInset(j)) = *(tabular->GetCellInset(i));
- }
+ paste_tabular = new LyXTabular(this, *tabular); // rows, columns);
+ int i;
+ for (i=0; i < sel_row_start; ++i)
+ paste_tabular->DeleteRow(0);
+ while(paste_tabular->rows() > rows)
+ paste_tabular->DeleteRow(rows);
+ paste_tabular->SetTopLine(0, true, true);
+ paste_tabular->SetBottomLine(paste_tabular->GetFirstCellInRow(rows-1),
+ true, true);
+ for (i=0; i < sel_col_start; ++i)
+ paste_tabular->DeleteColumn(0);
+ while(paste_tabular->columns() > columns)
+ paste_tabular->DeleteColumn(columns);
+ paste_tabular->SetLeftLine(0, true, true);
+ paste_tabular->SetRightLine(paste_tabular->GetLastCellInRow(0),true, true);
+
+ ostringstream sstr;
+ paste_tabular->Ascii(bv->buffer(), sstr);
+ bv->stuffClipboard(sstr.str().c_str());
return true;
}
{
if (!paste_tabular)
return false;
- for(int j=0, i=actcell; j<paste_tabular->GetNumberOfCells(); ++j,++i) {
+ for
(int j=0, i=actcell; j<paste_tabular->GetNumberOfCells(); ++j,++i) {
while (paste_tabular->row_of_cell(j) > tabular->row_of_cell(i)-actrow)
++i;
if (tabular->GetNumberOfCells() <= i)
{
if (!hasSelection())
return false;
- for(int i=sel_cell_start; i < sel_cell_end; ++i) {
- tabular->GetCellInset(i)->clear();
+
+ int sel_col_start, sel_col_end;
+ int sel_row_start, sel_row_end;
+
+ sel_col_start = tabular->column_of_cell(sel_cell_start);
+ sel_col_end = tabular->column_of_cell(sel_cell_end);
+ if (sel_col_start > sel_col_end) {
+ sel_col_start = sel_col_end;
+ sel_col_end = tabular->right_column_of_cell(sel_cell_start);
+ } else {
+ sel_col_end = tabular->right_column_of_cell(sel_cell_end);
+ }
+ sel_row_start = tabular->row_of_cell(sel_cell_start);
+ sel_row_end = tabular->row_of_cell(sel_cell_end);
+ if (sel_row_start > sel_row_end) {
+ //int tmp = sel_row_start;
+ //sel_row_start = sel_row_end;
+ //sel_row_end = tmp;
+ swap(sel_row_start, sel_row_end);
+ }
+ if (sel_cell_start > sel_cell_end) {
+ //int tmp = sel_cell_start;
+ //sel_cell_start = sel_cell_end;
+ //sel_cell_end = tmp;
+ swap(sel_cell_start, sel_cell_end);
+ }
+ for (int i = sel_row_start; i <= sel_row_end; ++i) {
+ for (int j = sel_col_start; j <= sel_col_end; ++j) {
+ tabular->GetCellInset(tabular->GetCellNumber(i, j))->clear();
+ }
}
return true;
}
projects / lyx.git / blobdiff