Really fix table borders toggling.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33506 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-02-19 09:03:39 +00:00
parent 98ed6f399e
commit 15e19deed3
2 changed files with 17 additions and 8 deletions

View File

@ -377,13 +377,13 @@ docstring GuiTabular::dialogToParams() const
&& !borders->getRight()) && !borders->getRight())
setParam(param_str, Tabular::UNSET_ALL_LINES); setParam(param_str, Tabular::UNSET_ALL_LINES);
else { else {
if (borders->getLeft()) if (borders->getLeft() != left_border_set_)
setParam(param_str, Tabular::TOGGLE_LINE_LEFT); setParam(param_str, Tabular::TOGGLE_LINE_LEFT);
if (borders->getRight()) if (borders->getRight() != right_border_set_)
setParam(param_str, Tabular::TOGGLE_LINE_RIGHT); setParam(param_str, Tabular::TOGGLE_LINE_RIGHT);
if (borders->getTop()) if (borders->getTop() != top_border_set_)
setParam(param_str, Tabular::TOGGLE_LINE_TOP); setParam(param_str, Tabular::TOGGLE_LINE_TOP);
if (borders->getBottom()) if (borders->getBottom() != bottom_border_set_)
setParam(param_str, Tabular::TOGGLE_LINE_BOTTOM); setParam(param_str, Tabular::TOGGLE_LINE_BOTTOM);
} }
@ -555,10 +555,14 @@ void GuiTabular::paramsToDialog(Inset const * inset)
longTabularCB->setChecked(tabular.is_long_tabular); longTabularCB->setChecked(tabular.is_long_tabular);
// //
borders->setTop(tabular.topLine(cell)); top_border_set_ = tabular.topLine(cell);
borders->setBottom(tabular.bottomLine(cell)); bottom_border_set_ = tabular.bottomLine(cell);
borders->setLeft(tabular.leftLine(cell)); left_border_set_ = tabular.leftLine(cell);
borders->setRight(tabular.rightLine(cell)); right_border_set_ = tabular.rightLine(cell);
borders->setTop(top_border_set_);
borders->setBottom(bottom_border_set_);
borders->setLeft(left_border_set_);
borders->setRight(right_border_set_);
// repaint the setborder widget // repaint the setborder widget
borders->update(); borders->update();

View File

@ -48,6 +48,11 @@ private:
void setVAlign(std::string & param_str) const; void setVAlign(std::string & param_str) const;
/// ///
void setTableAlignment(std::string & param_str) const; void setTableAlignment(std::string & param_str) const;
///
bool left_border_set_;
bool right_border_set_;
bool top_border_set_;
bool bottom_border_set_;
}; };
} // namespace frontend } // namespace frontend