* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index aa11692071db935852e307f2cf137275787e4ad2..2af61d15e5f8c4343bb0e4a04d02b8b7be3cc14b 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -44,6 +44,7 @@ using std::endl;
 namespace {
 
 typedef Translator<std::string, InsetBox::BoxType> BoxTranslator;
+typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
 
 BoxTranslator const init_boxtranslator()
 {
@@ -57,15 +58,14 @@ BoxTranslator const init_boxtranslator()
 }
 
 
-BoxTranslator const init_boxtranslator_loc()
+BoxTranslatorLoc const init_boxtranslator_loc()
 {
-       // FIXME UNICODE
-       BoxTranslator translator(to_utf8(_("Boxed")), InsetBox::Boxed);
-       translator.addPair(to_utf8(_("Frameless")), InsetBox::Frameless);
-       translator.addPair(to_utf8(_("ovalbox")), InsetBox::ovalbox);
-       translator.addPair(to_utf8(_("Ovalbox")), InsetBox::Ovalbox);
-       translator.addPair(to_utf8(_("Shadowbox")), InsetBox::Shadowbox);
-       translator.addPair(to_utf8(_("Doublebox")), InsetBox::Doublebox);
+       BoxTranslatorLoc translator(_("Boxed"), InsetBox::Boxed);
+       translator.addPair(_("Frameless"), InsetBox::Frameless);
+       translator.addPair(_("ovalbox"), InsetBox::ovalbox);
+       translator.addPair(_("Ovalbox"), InsetBox::Ovalbox);
+       translator.addPair(_("Shadowbox"), InsetBox::Shadowbox);
+       translator.addPair(_("Doublebox"), InsetBox::Doublebox);
        return translator;
 }
 
@@ -77,9 +77,9 @@ BoxTranslator const & boxtranslator()
 }
 
 
-BoxTranslator const & boxtranslator_loc()
+BoxTranslatorLoc const & boxtranslator_loc()
 {
-       static BoxTranslator translator = init_boxtranslator_loc();
+       static BoxTranslatorLoc translator = init_boxtranslator_loc();
        return translator;
 }
 
@@ -149,7 +149,6 @@ void InsetBox::setButtonLabel()
        BoxType btype = boxtranslator().find(params_.type);
 
        docstring label;
-       // FIXME UNICODE
        label += _("Box");
        label += " (";
        if (btype == Frameless) {
@@ -158,8 +157,7 @@ void InsetBox::setButtonLabel()
                else
                        label += _("Minipage");
        } else
-               // FXIME unicode
-               label += from_utf8(boxtranslator_loc().find(btype));
+               label += boxtranslator_loc().find(btype);
        label += ")";
 
        setLabel(label);
@@ -170,13 +168,21 @@ void InsetBox::setButtonLabel()
 }
 
 
-void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
+bool InsetBox::hasFixedWidth() const
+{
+      return params_.inner_box || params_.special != "width";
+}
+
+
+bool InsetBox::metrics(MetricsInfo & m, Dimension & dim) const
 {
        MetricsInfo mi = m;
-       if (params_.inner_box || params_.special != "width")
+       if (hasFixedWidth())
                mi.base.textwidth = params_.width.inPixels(m.base.textwidth);
        InsetCollapsable::metrics(mi, dim);
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }