Don't remove cell selections after fontchange.

[lyx.git] / src / insets / insettabular.C

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index c504aa15ff5299e79a363437ba60731cfcf62cbe..d21030ee98d11ebc7413c5f57dcac73490420171 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -48,6 +48,8 @@
 #include <map>
 //#include <signal.h>
 
+
+using std::vector;
 using std::ostream;
 using std::ifstream;
 using std::max;
@@ -372,16 +374,18 @@ void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline,
                // Here we use rectangular backgroundColor patches to clean up
                // within a cell around the cell's red inset box. As follows:
                //
-               //  +---+            +---+
-               //  |   |            |   |   The rectangles are A, B and C
+               //  +--------------------+
+               //  |         C          |   The rectangles are A, B and C
                //  | A |------------| B |   below, origin top left (tx, ty), 
                //  |   |  inset box |   |   dimensions w(idth), h(eight).
                //  +---+------------+---+   x grows rightward, y downward
                //  |         D          |
                //  +--------------------+
                //
+#if 0
                // clear only if we didn't have a change
                if (bv->text->status() != LyXText::CHANGED_IN_DRAW) {
+#endif
                        // clear before the inset
                        int tx, ty, w, h;
                        tx = nx + 1; 
@@ -407,7 +411,16 @@ void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline,
                        h = tabular->GetDescentOfRow(i) -
                                the_locking_inset->descent(bv, font) - 1;
                        pain.fillRectangle(tx, ty, w, h, backgroundColor());
+                       // clear above the inset
+                       tx = nx + 1;
+                       ty = baseline - tabular->GetAscentOfRow(i) + 1;
+                       w = tabular->GetWidthOfColumn(cell) -
+                               tabular->GetAdditionalWidth(cell) - 1;
+                       h = tabular->GetAscentOfRow(i) - the_locking_inset->ascent(bv, font);
+                       pain.fillRectangle(tx, ty, w, h, backgroundColor());
+#if 0
                }
+#endif
        }
        x -= ADD_TO_TABULAR_WIDTH;
        x += width(bv, font);
@@ -607,9 +620,11 @@ void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what,
        }
        if (need_update < what) // only set this if it has greater update
                need_update = what;
+#if 0 // maybe this should not be done!
        if ((what == INIT) && hasSelection()) {
                clearSelection();
        }
+#endif
        // Dirty Cast! (Lgb)
        if (need_update != NONE) {
                bv->updateInset(const_cast<InsetTabular *>(this), mark_dirty);
@@ -646,9 +661,6 @@ bool InsetTabular::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
                        if (in->getInsetFromID(id)) {
                                actcell = i;
                                in->edit(bv);
-//                             the_locking_inset = in;
-//                             locked = true;
-//                             resetPos(bv);
                                return the_locking_inset->lockInsetInInset(bv, inset);
                        }
                }
@@ -1112,7 +1124,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
 
                        while (p < len &&
                              ((p = clip.find_first_of("\t\n", p)) != string::npos)) {
-                               switch(clip[p]) {
+                               switch (clip[p]) {
                                case '\t':
                                        ++cols;
                                        break;
@@ -1136,7 +1148,7 @@ InsetTabular::localDispatch(BufferView * bv, kb_action action,
                              (p = clip.find_first_of("\t\n", p)) != string::npos) {
                                if (p >= len)
                                        break;
-                               switch(clip[p]) {
+                               switch (clip[p]) {
                                case '\t':
                                        paste_tabular->GetCellInset(cell)->setText(clip.substr(op, p-op));
                                        ++cols;
@@ -2352,7 +2364,7 @@ FuncStatus InsetTabular::getStatus(string const & what) const
 }
 
 
-std::vector<string> const InsetTabular::getLabelList() const
+vector<string> const InsetTabular::getLabelList() const
 {
        return tabular->getLabelList();
 }
@@ -2468,7 +2480,7 @@ bool InsetTabular::cutSelection()
 }
 
 
-bool InsetTabular::isRightToLeft(BufferView *bv )
+bool InsetTabular::isRightToLeft(BufferView * bv)
 {
        return bv->getParentLanguage(this)->RightToLeft();
 }