anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 23:07:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove relative units from bounding box

Browse Source 
When adding units to the external inset bounding box I overlooked that
InsetGraphics supports only bb, cm, mm and in. Therefore I added too many
units for the external insets. We are not as strict as the graphics inset
and allow all absolute units, but no relative ones.
This commit is contained in:
Georg Baum 2015-07-18 16:41:52 +02:00
parent eaf70913ac
commit bf515425e1
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt4/GuiExternal.cpp
View File

@ -220,6 +220,18 @@ GuiExternal::GuiExternal(GuiView & lv)
// add scale item
widthUnitCO->insertItem(0, qt_("Scale%"), "scale");
// remove all units from bb that depend on font or other dimensions
// we cannot use these, since we need to compare against absolute
// values from the image file.
xlUnitCO->noPercents();
xlUnitCO->removeFontDependent();
xrUnitCO->noPercents();
xrUnitCO->removeFontDependent();
ytUnitCO->noPercents();
ytUnitCO->removeFontDependent();
ybUnitCO->noPercents();
ybUnitCO->removeFontDependent();
}

8
src/frontends/qt4/LengthCombo.cpp
View File

@ -98,6 +98,14 @@ void LengthCombo::noPercents()
}
void LengthCombo::removeFontDependent()
{
removeUnit(Length::EM);
removeUnit(Length::EX);
removeUnit(Length::MU);
}
void LengthCombo::removeUnit(lyx::Length::UNIT unit)
{
QString const val = lyx::toqstr(lyx::stringFromUnit(unit));

2
src/frontends/qt4/LengthCombo.h
View File

@ -41,6 +41,8 @@ public:
virtual void setEnabled(bool b);
/// use the %-items?
void noPercents();
/// Remove EM, EX and MU units
void removeFontDependent();
/// remove a unit from the combo
void removeUnit(lyx::Length::UNIT unit);
/// add a unit to the combo