From d655ea1c810e20299b5f98b86fbad36d2e228e06 Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Sun, 17 Jul 2016 22:22:32 +0100 Subject: [PATCH] Fix bug 1449 Reduce height of Device ToolBar required by Gnome. --- src/toolbars/DeviceToolBar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/toolbars/DeviceToolBar.cpp b/src/toolbars/DeviceToolBar.cpp index fb7618e6d..78b8d3e93 100644 --- a/src/toolbars/DeviceToolBar.cpp +++ b/src/toolbars/DeviceToolBar.cpp @@ -462,8 +462,10 @@ void DeviceToolBar::RepositionCombos() desiredChannels.x = mInputChannels->GetBestSize().x; desiredChannels.y = mInputChannels->GetSize().y; + // wxGtk (Gnome) has larger comboboxes than the other platforms. For DeviceToolBar this prevents + // the toolbar docking on a single height row. So we shrink it to prevent this. #ifdef __WXGTK__ - desiredHost.SetHeight(mHost->GetBestSize().y); + desiredHost.SetHeight(mHost->GetBestSize().y -4); desiredInput.SetHeight(desiredHost.GetHeight()); desiredOutput.SetHeight(desiredHost.GetHeight()); desiredChannels.SetHeight(desiredHost.GetHeight());