X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.cpp;h=a3eb164d90cebef3d34c27be690e5ab67bdce3ac;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=126c8e5a168d66e2f2c7af06e104efdf437335f3;hpb=eea79637c78bb9916031924eca7b305cfb8e83df;p=lyx.git

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 126c8e5a16..a3eb164d90 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -15,46 +15,33 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
+#include "Color.h"
 #include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Lexer.h"
 #include "OutputParams.h"
+#include "TextClass.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-
-
-void InsetBranch::init()
-{
-	setButtonLabel();
-}
-
 
 InsetBranch::InsetBranch(BufferParams const & bp,
 			 InsetBranchParams const & params)
 	: InsetCollapsable(bp), params_(params)
-{
-	setLayout(bp);
-	init();
-}
+{}
 
 
 InsetBranch::InsetBranch(InsetBranch const & in)
 	: InsetCollapsable(in), params_(in.params_)
-{
-	init();
-}
+{}
 
 
 InsetBranch::~InsetBranch()
@@ -86,8 +73,12 @@ void InsetBranch::read(Buffer const & buf, Lexer & lex)
 {
 	params_.read(lex);
 	InsetCollapsable::read(buf, lex);
-	setLayout(buf.params());
-	setButtonLabel();
+}
+
+
+docstring InsetBranch::toolTip(BufferView const & bv, int x, int y) const
+{
+	return _("Branch: ") + params_.branch;
 }
 
 
@@ -101,7 +92,7 @@ void InsetBranch::setButtonLabel()
 			s = _("Undef: ") + s;
 		}
 	}
-	if (decoration() == Classic)
+	if (decoration() == Deco_Classic)
 		setLabel(isOpen() ? s : getNewLabel(s) );
 	else
 		setLabel(params_.branch + ": " + getNewLabel(s));
@@ -137,7 +128,6 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
 		InsetBranchMailer::string2params(to_utf8(cmd.argument()), params);
 		params_.branch = params.branch;
 		setLayout(cur.buffer().params());
-		setButtonLabel();
 		break;
 	}
 
@@ -222,7 +212,7 @@ bool InsetBranch::isBranchSelected(Buffer const & buffer) const
 	BranchList const & branchlist = realbuffer.params().branchlist();
 	BranchList::const_iterator const end = branchlist.end();
 	BranchList::const_iterator it =
-		std::find_if(branchlist.begin(), end,
+		find_if(branchlist.begin(), end,
 			     BranchNamesEqual(params_.branch));
 	if (it == end)
 		return false;
@@ -286,6 +276,12 @@ void InsetBranch::validate(LaTeXFeatures & features) const
 }
 
 
+bool InsetBranch::isMacroScope(Buffer const & buf) const 
+{
+	// Its own scope if not selected by buffer
+	return !isBranchSelected(buf);
+}
+
 
 string const InsetBranchMailer::name_("branch");