horizontal toolbar support
authorDennis Ushakov <dennis.ushakov@gmail.com>
Tue, 31 Jan 2012 10:46:35 +0000 (14:46 +0400)
committerDennis Ushakov <dennis.ushakov@gmail.com>
Tue, 31 Jan 2012 10:52:59 +0000 (14:52 +0400)
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java
platform/platform-resources/src/idea/LangActions.xml

index 7203667e610c526316ac10fcbfb57bec40d0ee0d..8fcbbed3abb3c65604a38a6fdd8a6165ad94023a 100644 (file)
@@ -116,7 +116,7 @@ public class GridCellImpl implements GridCell {
       }
     }).setSideComponentVertical(!context.getLayoutSettings().isToolbarHorizontal())
       .setStealthTabMode(true).setFocusCycle(false).setPaintFocus(true)
-      .setProvideSwitchTargets(false).setTabDraggingEnabled(true);
+      .setProvideSwitchTargets(false).setTabDraggingEnabled(true).setSideComponentOnTabs(false);
 
     myTabs.addTabMouseListener(new MouseAdapter() {
       public void mousePressed(final MouseEvent e) {
index 988721d50064e11f3ea560df3cf1a711eab71a20..4be237f92767fe7b5b6b946fca85636c262e39ce 100644 (file)
@@ -1324,7 +1324,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
   }
 
   public boolean isHorizontalToolbar() {
-    return false;
+    return myLayoutSettings.isToolbarHorizontal();
   }
 
   public ActionCallback select(final Content content, final boolean requestFocus) {
index 2f6dbc88635c8d7ee30315acad872690b633718f..851d3a42944c52b0acc0baf83629174aa5c8dde9 100644 (file)
@@ -174,7 +174,7 @@ public class RunnerLayout  {
   }
 
   public boolean isToolbarHorizontal() {
-    return false;
+    return myGeneral.horizontalToolbar;
   }
 
   public void setToolbarHorizontal(boolean horizontal) {
index 7238c588fb279428eeb87d3b2a3f8642ab7c4b20..8390774e613397f820fe356013909cd99454acc0 100644 (file)
     </group>
 
     <group id="RunnerLayoutActions">
-      <group id="Runner.Layout" icon="/debugger/restoreLayout.png">
+      <group id="Runner.Layout" icon="/debugger/restoreLayout.png" popup="true">
         <action id="Runner.RestoreLayout" class="com.intellij.execution.ui.layout.actions.RestoreLayoutAction"
                 icon="/debugger/restoreLayout.png"/>
-        <!--action id="Runner.ToggleToolbarLayout" class="com.intellij.execution.ui.layout.actions.ToggleToolbarLayoutAction"/-->
+        <action id="Runner.ToggleToolbarLayout" class="com.intellij.execution.ui.layout.actions.ToggleToolbarLayoutAction"/>
       </group>