From fc0f77044dee6e161746e7df81e7006581c5e014 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 2 Nov 2007 22:10:59 +0000
Subject: [PATCH] fix layout of InsetBox and remove unused InsetCollapsable
 methods.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21393 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/stdinsets.inc       |  4 ++++
 src/insets/InsetBox.cpp         |  2 --
 src/insets/InsetCollapsable.cpp | 22 ++--------------------
 src/insets/InsetCollapsable.h   |  6 ------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 2b483cbf8c..731104e9f2 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -177,6 +177,10 @@ InsetLayout Index
 End
 
 InsetLayout Box
+	LabelFont
+	  Color               foreground
+	  Size                Small
+	EndFont
 	MultiPar              true
 End
 
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index b86d6f4852..c88866d3d3 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -155,8 +155,6 @@ void InsetBox::setButtonLabel()
 	label += ")";
 
 	setLabel(label);
-
-	setLabelColor(Color_foreground);
 }
 
 
diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 98e4a96ac4..c5f14d0773 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -191,7 +191,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 	autoOpen_ = mi.base.bv->cursor().isInside(this);
 
 	FontInfo tmpfont = mi.base.font;
-	getDrawFont(mi.base.font);
+	mi.base.font = layout_.font;
 	mi.base.font.realize(tmpfont);
 
 	switch (geometry()) {
@@ -258,7 +258,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 	pi.background_color = backgroundColor();
 
 	FontInfo tmpfont = pi.base.font;
-	getDrawFont(pi.base.font);
+	pi.base.font = layout_.font;
 	pi.base.font.realize(tmpfont);
 
 	// Draw button first -- top, left or only
@@ -620,12 +620,6 @@ void InsetCollapsable::resetParagraphsFont()
 }
 
 
-void InsetCollapsable::getDrawFont(FontInfo & font) const
-{
-	font = layout_.font;
-}
-
-
 bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
@@ -765,18 +759,6 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 }
 
 
-void InsetCollapsable::setLabelFont(FontInfo const & font)
-{
-	layout_.labelfont = font;
-}
-
-
-void InsetCollapsable::setLabelColor(ColorCode code)
-{
-	layout_.labelfont.setColor(code);
-}
-
-
 docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
 {
 	FloatList const & floats = bp.getTextClass().floats();
diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 7803e86039..fb8e175857 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -72,10 +72,6 @@ public:
 	///
 	virtual void setButtonLabel() {}
 	///
-	void setLabelFont(FontInfo const & f);
-	///
-	void setLabelColor(ColorCode code);
-	///
 	bool isOpen() const { return geometry() != ButtonOnly; }
 	///
 	CollapseStatus status() const;
@@ -159,8 +155,6 @@ protected:
 	docstring floatName(std::string const & type, BufferParams const &) const;
 	///
 	virtual void resetParagraphsFont();
-	///
-	virtual void getDrawFont(FontInfo &) const;
 
 protected:
 	///
-- 
2.39.2