diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java index cf8220dda..6ab7e3ccd 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java @@ -107,10 +107,9 @@ public AccountStatusPanel(MainFrame mainFrame) statusComboBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); TransparentPanel statusToolsPanel - = new TransparentPanel(new BorderLayout()); + = new TransparentPanel(new BorderLayout(0, 0)); SIPCommMenuBar statusMenuBar = new SIPCommMenuBar(); - statusMenuBar.setLayout(new BorderLayout(0, 0)); statusMenuBar.add(statusComboBox); statusToolsPanel.add(statusMenuBar, BorderLayout.WEST); @@ -121,10 +120,11 @@ public AccountStatusPanel(MainFrame mainFrame) statusToolsPanel.add(pluginPanel, BorderLayout.EAST); - TransparentPanel rightPanel - = new TransparentPanel(new GridLayout(0, 1, 0, 0)); - rightPanel.add(accountNameLabel); - rightPanel.add(statusToolsPanel); + TransparentPanel rightPanel = new TransparentPanel(); + rightPanel.setLayout(new BorderLayout(0, 0)); + rightPanel.setBorder(BorderFactory.createEmptyBorder(3, 0, 3, 0)); + rightPanel.add(accountNameLabel, BorderLayout.NORTH); + rightPanel.add(statusToolsPanel, BorderLayout.SOUTH); this.add(accountImageLabel, BorderLayout.WEST); this.add(rightPanel, BorderLayout.CENTER); @@ -352,4 +352,4 @@ public void paintComponent(Graphics g) null); } } -} +} \ No newline at end of file diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java index 76f0aa411..b550e60c0 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java @@ -145,6 +145,7 @@ public GlobalStatusSelectorBox(MainFrame mainFrame) this.addSeparator(); this.setIcon(offlineItem.getIcon()); + this.setIconTextGap(2); this.setOpaque(false); this.setText("Offline"); this.setToolTipText("Set global status");