From: Peter Kümmel <syntheticpp@gmx.net>
Date: Wed, 8 Nov 2006 23:15:25 +0000 (+0000)
Subject: use default.ui position as fall back value
X-Git-Tag: 1.6.10~11976
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6ced7141d2fc20287cadcb77fdc06332a58dd8fe;p=features.git

use default.ui position as fall back value

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15810 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C
index f03e50a070..6d644be4c3 100644
--- a/src/frontends/Toolbars.C
+++ b/src/frontends/Toolbars.C
@@ -45,7 +45,10 @@ void Toolbars::initFlags(ToolbarBackend::Toolbar & tbb)
 	ToolbarSection::ToolbarInfo & info = LyX::ref().session().toolbars().load(tbb.name);
 
 	unsigned int flags = static_cast<unsigned int>(tbb.flags);
-	// remove position
+
+	// Remove default.ui positions. Only when a valid postion is stored 
+	// in the session file the default.ui value will be overwritten
+	unsigned int save = flags;
 	TurnOffFlag(TOP);
 	TurnOffFlag(BOTTOM);
 	TurnOffFlag(RIGHT);
@@ -62,7 +65,8 @@ void Toolbars::initFlags(ToolbarBackend::Toolbar & tbb)
 	else if (info.location == ToolbarSection::ToolbarInfo::LEFT)
 		TurnOnFlag(LEFT);
 	else {
-		TurnOnFlag(TOP);
+		// use setting from default.ui
+		flags = save;
 		valid_location = false;
 	}