From 1460e91541c7748af85b286567634f36855a6ab7 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 18 Sep 2013 18:07:49 +0300
Subject: [PATCH] Changes scrollable tabs forward/backward icons if new message
 is received and the tab is not in the visible list of opened chat tabs, a
 problem where user can miss messages if too many open tabs exist.

---
 resources/images/images.properties            |   2 +
 .../images/impl/gui/common/tabBackward.png    | Bin 0 -> 1134 bytes
 .../images/impl/gui/common/tabForward.png     | Bin 0 -> 1140 bytes
 .../plaf/SIPCommTabbedPaneEnhancedUI.java     |  85 +++++++++++++++++-
 .../desktoputil/plaf/SIPCommTabbedPaneUI.java |   6 +-
 5 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 resources/images/impl/gui/common/tabBackward.png
 create mode 100644 resources/images/impl/gui/common/tabForward.png

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 762de5dbc..df885dab0 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -40,6 +40,8 @@ service.gui.icons.FONT_ICON=resources/images/impl/gui/buttons/fontIcon.png
 service.gui.icons.ADD_CONTACT_CHAT_ICON=resources/images/impl/gui/buttons/addContactChatIcon.png
 service.gui.icons.CHAT_CONFIGURE_ICON=resources/images/impl/gui/buttons/chatConfigureIcon.png
 service.gui.icons.WARNING_ICON=resources/images/impl/gui/common/warning.png
+service.gui.icons.TAB_UNREAD_FORWARD_ICON=resources/images/impl/gui/common/tabForward.png
+service.gui.icons.TAB_UNREAD_BACKWARD_ICON=resources/images/impl/gui/common/tabBackward.png
 service.gui.icons.ERROR_ICON=resources/images/impl/gui/common/error.png
 service.gui.icons.INFO_ICON=resources/images/impl/gui/common/info.png
 service.gui.icons.SEND_MESSAGE_16x16_ICON=resources/images/impl/gui/common/sendMessage16x16.png
diff --git a/resources/images/impl/gui/common/tabBackward.png b/resources/images/impl/gui/common/tabBackward.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bdb3dd07fa828ac367744536d9105c1e548a281
GIT binary patch
literal 1134
zcmbVMO-K|`9G}|I&6Mm5)S`wlBBR~;+L_%Q+|=FK$%WQrU2+QoXJ?-7p!3np(;cNq
zO9CN6J9P*z9lA(?*C>NNKoLAi(V>&nF{ncY!uDp}wGQH;VP@WY|M~xZ|L>XU?YY=c
z*HVXJSVO8?%%HU%J+=NC^lo2VIE|KOn9RXGa}X9~8(>|knFn}Emxn+G$m;lwWzddc
zzJiv`!Cd;1pqP44_H=@-ZXq<H>2NJs83qu~gCWg`5#L@c5xAzth<+|jrL6=gXx$Sw
z=$q)tDigy>R3$nt;O(w}2y_5t+|@@6M{r|AnO8u2PfQYcSp^Qqh%Kjb>0Ufx+5qQ*
zY(SxC8t3^S9pZSNK94gL&5#tj`2ZafI9_1Fc;zCHHCr7NGNM$mg-$V|0HGz2WU*Kb
z7TKU_50P{<8ud6BCV(^o&bR?(H()reRR$3_imh2tGY#Bhl=J2&j1kDwtq^o8o!%xk
zoJyil%1BqXNIFQ7y6(kQ)^=b9{B>hTZ6`Z!0Wt#|bJSK)JqBB=V3fPv4S9;l8{x98
zp`yqmqN$APz<?<+MxZZ2RZ|6ui=ZrqLsXcd_y|o$=p-kFc#+|vBA<*hRgRso2}ukw
zWq6XM=_DHuNnAX{u@R9=M50WxicJ{~lnn(`?P|zw1xwN4U9dvJ1~N45tZ9x^JD|5<
zLenXj7M|$i@v~`J(F{+}<`rlwUJ=;Z7*HkK)bVnL1#Jfp!aPq!qy!}<8M+)f6=CCX
zNt7s&qS=H*RIuv*WQ|15kY0QI(=JsJ>OpV2-TdgVJwCudGh?ISh@5I)M}ze^C3a=q
zPx;MKsl!*l8U`DAb--O)dHcHM*7uGhz7}kyG&HSY_P$3=&7VK|S<0u~^F43wJp6Fx
zX=!P?ZLARtOb+Kp-v3&=Ha#_WXjy!xmzw8}-NkagMeOL!+H+sx{q-NPy+2<z$@9N!
zv#a+Pj;9_>$@BZ)+@3wt`0DG-z!PQmgrA*S@LfHyzE<PZ2n|0Dc24fW+$+~lZbbc?
P-X9>9>=B>E2k!g<BRFW?

literal 0
HcmV?d00001

diff --git a/resources/images/impl/gui/common/tabForward.png b/resources/images/impl/gui/common/tabForward.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee82f5bff6262cc42a39d0c1bf40a652f4b7b6f
GIT binary patch
literal 1140
zcmbVMPiW*+7@yj1mC~+=m13a~(`C`(Bzc)hCW#$OXOh?fr+;P!9jObZ$(v4Slb0s1
z&P>sRT^1CUvg{t#UKT6vq3doB9$T>8Rd*Fi?LlzaJqX)9C|Zghya?jUbf$VJJs6U_
z_r83;-}gTsjgP+8)zRA#iA1_GBWjMUo#c7)sdn-n{Nm;rvOJHqBF>`{t{6Uy3|nXl
zQW?jXhB;_hwYl%$U?kF7whKjE%)YLe$YG37hp9RqK@*yxs%Mxp5K~id+IExl!Nw*{
z*;bN%Q^;~zFAdA~$bt{^3!?>dVaAj#dgxVZu&NLO2V#S&I<sz|RFia_S0VdQ%+gd{
z1<xeuL#K+_aVm{`NC`|VYH|QjqR4=_Ad28+ist~&a^x1HAg&0a!Y8Q4MH6ejRZ?=Q
z-mpbZNxF=&r?70LQei4F2Km!0kYzdK;Q1)ghz2zm8`Y>A^fwt)7?{58VH>$r$Y@NV
zd7Pw)r-vapUN(C~>;{cQk(9Aj!(#!%v5phQRo4!14*u)LvD!hQ=0P?G12pfOq#mXI
zCYa>zWJ94M@kSZ*ZBi6tRz>E#16`a^lQj9lShl5bf<&^Ih;s>^6D0s7pb2_hRCz&G
zMNQ_L9LHf}8lMtXi3f?427nez#dRSS7h;ksq$Qcxn%ImRV8b<G)2>bIHn7C>30NiV
zLjxnffY5BS1IEh;qo9mDDxDXp7qf<GyP@Evut10Ls?fLJg_iCkhpJ~-v5)Z}A&Q)&
zr#V&QK|OL#iltJzs&gs_VriXjV6Fd?HI_KThVAj6c4>-84~E;L<|l`v@qsRx8J`Tt
z)xs^74A!R^b+}M{@b(foeTVDRHuGQa${#Mj(tY;Qy5Gs@Jv&?5TX*}4&!i~vhYvnJ
zxS>yc+5OkO@0ZTM-+F!g+E*Q`GrL!Qtesn%{P~xb-<W|<)~|0byZfD&yQQJu;nHKY
zcl(JI;YMw7LwNeq+_MweHuhqN`^U;RbNBxQsMPnu&fl$jzdpK_7V-mcecRi1q4>F9
nnq2I84=%5+{<QyasHHvf*{L_i_}=H_@IR2zM%A^{JB$ASWUF$o

literal 0
HcmV?d00001

diff --git a/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneEnhancedUI.java b/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneEnhancedUI.java
index 0710c3bf2..1a1954d23 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneEnhancedUI.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneEnhancedUI.java
@@ -412,17 +412,96 @@ public void paint(Graphics g)
             // Draw the arrow
             size = Math.min((h - 4) / 3, (w - 4) / 3);
             size = Math.max(size, 2);
-            paintTriangle(g, (w - size) / 2, (h - size) / 2, size, direction,
-                    isEnabled);
+
+            boolean highlight = false;
+
+            if(!highlightedTabs.isEmpty() &&
+                ((direction == WEST
+                    && tabScroller.scrollBackwardButton.isEnabled())
+                || (direction == EAST
+                    && tabScroller.scrollForwardButton.isEnabled())))
+            {
+                Rectangle viewRect = tabScroller.viewport.getViewRect();
+
+                if(direction == WEST)
+                {
+                    int leadingTabIndex = getClosestTab(viewRect.x, viewRect.y);
+
+                    for(int i = 0; i < leadingTabIndex; i++)
+                    {
+                        if(highlightedTabs.contains(i)
+                           && !isScrollTabVisible(i))
+                        {
+                            highlight = true;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    int leadingTabIndex =
+                        getClosestTab(viewRect.x + viewRect.y, viewRect.y);
+
+                    for(int i = leadingTabIndex; i < tabPane.getTabCount(); i++)
+                    {
+                        if(highlightedTabs.contains(i)
+                            && !isScrollTabVisible(i))
+                        {
+                            highlight = true;
+                            break;
+                        }
+                    }
+                }
+
+                if(highlight)
+                {
+                    Image img = DesktopUtilActivator.getImage(
+                        direction == WEST ?
+                            "service.gui.icons.TAB_UNREAD_BACKWARD_ICON"
+                            : "service.gui.icons.TAB_UNREAD_FORWARD_ICON");
+
+                    int wi = img.getWidth(null);
+
+                    g.drawImage(img,
+                                (w - wi)/2,
+                                (h - size) / 2 - 2/* 2 borders 1px width*/,
+                                null);
+                }
+            }
+
+            if(!highlight)
+                paintTriangle(g, (w - size) / 2, (h - size) / 2,
+                    size, direction, isEnabled);
 
             // Reset the Graphics back to it's original settings
             if (isPressed) {
                 g.translate(-1, -1);
             }
             g.setColor(origColor);
-
         }
+    }
 
+    /**
+     * Checks whether the <tt>tabIndex</tt> is visible in the scrollable
+     * tabs list.
+     *
+     * @param tabIndex the tab index to check.
+     * @return whether <tt>tabIndex</tt> is visible in the list of scrollable
+     * tabs.
+     */
+    private boolean isScrollTabVisible(int tabIndex)
+    {
+        Rectangle tabRect = rects[tabIndex];
+        Rectangle viewRect = tabScroller.viewport.getViewRect();
+        if ((tabRect.x + tabRect.width - BUTTONSIZE < viewRect.x)
+            || (tabRect.x + BUTTONSIZE > viewRect.x + viewRect.width))
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
     }
 
     @Override
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneUI.java b/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneUI.java
index 8afc0ec11..bbe944904 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneUI.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/plaf/SIPCommTabbedPaneUI.java
@@ -863,7 +863,7 @@ public int getOverTabIndex()
      * Returns the index of the tab closest to the passed in location, note that
      * the returned tab may not contain the location x,y.
      */
-    private int getClosestTab(int x, int y)
+    protected int getClosestTab(int x, int y)
     {
         int min = 0;
         int tabCount = Math.min(rects.length, tabPane.getTabCount());
@@ -1358,7 +1358,7 @@ protected void calculateTabRects(int tabPlacement, int tabCount)
         }
     }
 
-    private class ScrollableTabSupport implements ChangeListener
+    protected class ScrollableTabSupport implements ChangeListener
     {
         public ScrollableTabViewport viewport;
 
@@ -1471,7 +1471,7 @@ public String toString()
 
     }
 
-    private static class ScrollableTabViewport
+    protected static class ScrollableTabViewport
         extends JViewport
         implements UIResource
     {