From 363367b247e69b52b690cc554ba6b7901742a441 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Tue, 29 Nov 2011 12:32:28 +0400
Subject: [PATCH] new ui: hide toolwindow action by default (instead of hide
 side)

---
 platform/icons/src/general/hideDownPart.png   | Bin 1415 -> 1413 bytes
 platform/icons/src/general/hideLeftPart.png   | Bin 313 -> 691 bytes
 platform/icons/src/general/hideRightPart.png  | Bin 1514 -> 1494 bytes
 .../openapi/wm/impl/ToolWindowHeader.java     |  21 +++++++++++-------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/platform/icons/src/general/hideDownPart.png b/platform/icons/src/general/hideDownPart.png
index 8f7f397f6eddfcc54da6d9ee1067f10ac0d02219..90a30c03a4d703e434dc90de763f77a2caf9ad7a 100644
GIT binary patch
delta 225
zcmV<703QE`3xx}?tptC=Nkl<ZI1yv~|NlP&C4h+%%^<y44RElxBidP54Pa(rCfZ?G
z4Io-KE-x_tV<g%PtS(?>XC>MIM&xKrPRscJ{P9Bu9$sDsW+o;EbuBH1hPpbu&Ovd(
z+*vak6;(ADe*gT*psuY8(%eYUDIgc1;RcXPfS>_Q99<olk5yTaSj`{{P{JT6D2V6;
zv~JxxaM-Y*`%zd}7+J^!nS;bW17l+tz|PJNlLOIkg~)=)Y!oj5B^r<=39!Lx(G4J=
b2U8jV*AIwz^&Dy800000NkvXXu0mjfQtVtg

delta 227
zcmV<90382?3x^A^tptC?Nkl<ZI1yv~|NlP&C4h+%%^<x54RElx!|OzX1~9WQ<8>rK
z1Muo5#tV%981b4x&;_jQtauGz#1)OnX&L{YKYqx-!^_LS%*4c?uBFA$P*;cH9Gotg
zJ8MRxqN)bN@1H*z)U|a%nj5h?1>^!exB=u6AZWm)2A^h_98O!!AVX2YASfsZZ=yl=
z!n$?qz~RAyEC^x?3kxF)nILnJ*k@pD3<KEN*<o@Z8m<so5SfkQ1)xL&vLpdESS`8%
d1oU7^0|554h<MZ06MFyv002ovPDHLkV1n5GW6b~n

diff --git a/platform/icons/src/general/hideLeftPart.png b/platform/icons/src/general/hideLeftPart.png
index f9710f1d19539e8849096ebdbf9ef82fd22f4f84..01e916ad7262b835192c81907a531ba3081e752a 100644
GIT binary patch
literal 691
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wk0|R4T
zW=KRygs+cPa(=E}VoH8es$NBI0Z=sqgH44MkeQoWlBiITo0C^;Rbi_HR$&EXgM{^!
z6u?SKvTc<jd;=7m^NUgyO!Q3j43zA+6ciL}ic-?7f?V97+JQV<rHqo20xNy}^73-M
za$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#ykcdDAuw}XQj3#|G7CyF^Yauy<|ZcP
zmzLNnDS<441Bg3QlHv9glosWHZAnSiPt8fqP0cGQ);H8M)Q1}m)N7NHY*k#El$DxX
z0(LjtIIstt64UjOgl+UORom!;T!iF8i1)#wK>you+33T=(vIt?J+C7$cwc+EIEGmC
zCja^W-=0~up;PH@i0Ogjw_oqyKmUHce7?Sj{nYTV$6uB2F!=fDv3Y80vH|HGDYeO`
z|1a;Cdr->A-E;8h*`q+m9{BM0w>cXSv~{hT^?!Z5P4a`MkCQw4y8irs{ak-XX?@-Q
z#EAWg%F11ghYlU$k&%(%0ns2Jo2%P9dAZ;E{grRI4qr+=EzP;B;h{bA;r;dheI))F
z&uQ#3d6JfH<TKA`>Ac3qg^e2+Z#X*V`SHcEc4VZuES|`tc#gs7pn}nZ>+9or_SgNj
u`uzI3{v@6Rms7pG9*=k>v^otMbQl<Nt-YFSnC$sL$;#8!&t;ucLK6VU?&qTb

delta 250
zcmV<W00sZE1-Sx{IFqsg6Mxh&fCa|z@%H-9%*?{@_wOHuEnBxSlI#LbPA&#XDJcd{
zPA>9Xz{SnQARr*X@csKYk_>>mKv-CqfrEpCL0DKAML~IGHQs1K1mb@NhJXM5nJ^$J
zuWxMm|MbxVye?qDB~ejT^Z)gWXAHc2d<@Z1k^g`F`~|n}&+k7B>u)z~WJEQ95tZ&}
zYiXQ3b$b2HYgZVSE?eG6vI`g(7#ec3GZ`jNnNrWdz|cUB0T4rSa_}l3CMDvu9mRlO
zzkV_N`t|F~uV252FcSe7k#ZxlO?Yj^WdK<K08k4{5lMRv^#A|>07*qoM6N<$f-XgJ
AHvj+t

diff --git a/platform/icons/src/general/hideRightPart.png b/platform/icons/src/general/hideRightPart.png
index d78c30f020b28b5c205efbd9d7e1cfb4afe536ef..8b4ce8ec2df759206bf0566d8e4144ceb4a5cb1e 100644
GIT binary patch
delta 307
zcmV-30nGmD3)Ty;tptA*Nkl<ZI1yv~|NlP&C4h+%%^<ya4PXQULKd*#Q;?LJ{tsvd
z6VRJrf4aFi|7T`lW%&E&H^Z(yd%=do4M4XIr0MzNhYVS{1#m;SxVRZu+1VL>|NIHJ
z7jA&Po$Wtn7G|&n<3C0QPY-tnUOs+?XAkc&B&TJ74T+45VBmk|=3)5y^$XkpMyTsR
z0u69cC?hf=qE<s&m$AOKx(Os7A0PLh4`}G8Pahc;E?k7_1&{)$J~*YJtz8Gx3>E~2
z#NWSvO&I<&oPjCA8w>TdwP2fJim}mn4FGCrK+yz?R2U7EBxC@Jerz228UPGHjEqB)
z3qS_^`0?ZP_wOs;;RYe618iPI7i&Ng0JBLo07*ZD2>`fwUu#}jo@4+3002ovPDHLk
FV1k{kgHr$i

delta 327
zcmV-N0l5Cw3+fB7tptB4Nkl<ZI1yv~|NlP&C4h+%%^<xL8^A(}3*20s|1-0&GW`AX
zn_<_Uy^J8eBpJZP#m&IV&d%`r=TEr3cnx3#0$?D+Lz#<*n}M5~hvDnjFK`3!hCxzl
z`ah5%Fx9NAtPC6+91I{D2H*yO6e0tVg6EGPGGyfzAPfPz<?nyrza|WDHz9?Ay`Akp
zW)^0!!HoYH89Y7Q8F=~l8J<17$B>+s0WyRsE;bfsF`R~n!GVK^8sVZ)Mr1@pt+t67
zV|{IP)0~;p|HsG2L1f^bLUI96rU9xCPHAXs*MT%+lY=ROhXG6gnXa#`#j6>l7Ow$7
z`38_882I<^A5uT?K|~1|0MiSm|NQy$|L4!2r+@tT0XGPgP*4;R;4~n~gW04SfTSP7
Z1OTvtQsan{(`f(z002ovPDHLkV1f(zm;C?$

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
index 4ce4648448d0..954c47cc958e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
@@ -123,27 +123,27 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable {
 
     eastPanel.add(Box.createHorizontalStrut(3));
 
-    myHideButton = new ActionButton(new HideSideAction() {
-      @Override
-      public void actionPerformed(AnActionEvent e) {
-        sideHidden();
-      }
-    }, new HideAction() {
+    myHideButton = new ActionButton(new HideAction() {
       @Override
       public void actionPerformed(AnActionEvent e) {
         hideToolWindow();
       }
+    }, new HideSideAction() {
+      @Override
+      public void actionPerformed(AnActionEvent e) {
+        sideHidden();
+      }
     },
                                     ourHideLeftSideIcon, null, null
     ) {
       @Override
       protected Icon getActiveIcon() {
-        return getHideIcon(myToolWindow);
+        return getHideToolWindowIcon(myToolWindow);
       }
 
       @Override
       protected Icon getAlternativeIcon() {
-        return getHideToolWindowIcon(myToolWindow);
+        return getHideIcon(myToolWindow);
       }
     };
 
@@ -455,6 +455,11 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable {
     if (shortcutForAction.length() > 0) {
       text += "  " + shortcutForAction;
     }
+
+    if (action instanceof HideAction) {
+      text += String.format(" (Click with %s to Hide Side)", KeymapUtil.getShortcutText(KeyboardShortcut.fromString("pressed ALT")));
+    } 
+     
     return text;
   }