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

Use proper localization chain for Box special width/height

Browse Source 
Fixes: #11000
(cherry picked from commit e2160ec960de2f48e5b61dfab339902426d075f8)
This commit is contained in:
Juergen Spitzmueller 2018-01-27 12:26:01 +01:00
parent 0df51f0f85
commit a9eee8e1c0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiBox.cpp
View File

@ -440,7 +440,7 @@ docstring GuiBox::dialogToParams() const
if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) { if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) {
params.special = fromqstr(unit); params.special = fromqstr(unit);
// Note: the unit is simply ignored in this case // Note: the unit is simply ignored in this case
params.width = Length(value.toDouble(), Length::IN); params.width = Length(widgetToDouble(widthED), Length::IN);
} else { } else {
params.special = "none"; params.special = "none";
// we must specify a valid length in this case // we must specify a valid length in this case
@ -466,7 +466,7 @@ docstring GuiBox::dialogToParams() const
if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) { if (ids_spec_.contains(unit) && !isValidLength(fromqstr(value))) {
params.height_special = fromqstr(unit); params.height_special = fromqstr(unit);
// Note: the unit is simply ignored in this case // Note: the unit is simply ignored in this case
params.height = Length(value.toDouble(), Length::IN); params.height = Length(widgetToDouble(heightED), Length::IN);
} else { } else {
params.height_special = "none"; params.height_special = "none";
params.height = params.height =

3
status.22x
View File

@ -106,6 +106,9 @@ What's new
- Fix crash when changing preview preferences while previewable - Fix crash when changing preview preferences while previewable
external inset is open (bug 10785). external inset is open (bug 10785).
- Fix problem with decimal special height/width values in the Box
dialog in some localizations (bug 11000).
- Remove duplicate entries from the Symbols dialog (bug 10644). - Remove duplicate entries from the Symbols dialog (bug 10644).
- Always show the float type in the float inset label (bug 10618). - Always show the float type in the float inset label (bug 10618).