summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2024-04-25 13:53:18 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2024-04-25 18:23:40 +0200
commitdee3e2d7c8d412951099e4425e6ece24431cd98d (patch)
treefeb48bbaaabe6dd20421dbb0dbdb4118618dc852 /sd
parentbdc90ee923fc68f57fc7234192be2ba512797775 (diff)
Related tdf#87676 Enable text formatting toolbar when in a text box
Use the second row (hiding the shapes toolbar) to show the text formatting toolbar when the user is inside a text box. This helps users to do basic text formatting at the place where they expect the controls from Writer, Calc, etc. Otherwise, when the Sidebar is switched to another Deck, finding the text formatting functions can be hard in the classic toolbar layout. Change-Id: I8d6f54e6f3f44917b0c89ae699c2798e4f6b86a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166621 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Tested-by: Jenkins
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/ToolBarManager.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 7dd95c962499..5296b7bd94ef 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -1079,6 +1079,8 @@ void ToolBarRules::SelectionHasChanged (
case ::sd::ViewShell::ST_HANDOUT:
mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Function,
ToolBarManager::msDrawingObjectToolBar);
+ mpToolBarManager->SetToolBar(ToolBarManager::ToolBarGroup::Permanent,
+ ToolBarManager::msToolBar);
break;
default:
break;
@@ -1122,6 +1124,7 @@ void ToolBarRules::SubShellAdded (
break;
case ToolbarId::Draw_Text_Toolbox_Sd:
+ mpToolBarManager->RemoveToolBar(ToolBarManager::ToolBarGroup::Permanent, ToolBarManager::msToolBar);
mpToolBarManager->AddToolBar(eGroup, ToolBarManager::msTextObjectBar);
break;