diff options
author | Yana Stamcheva <yana@jitsi.org> | 2012-09-27 18:16:30 +0000 |
---|---|---|
committer | Yana Stamcheva <yana@jitsi.org> | 2012-09-27 18:16:30 +0000 |
commit | 9378c38d9a688614165b73f8f7ce76b01501aecd (patch) | |
tree | 77a46f84b43205f26b19aa570e4bc08e58366ebc /src/net | |
parent | 2cfb06bf36d8bc895ddf5d7f430b841113f53e8d (diff) | |
download | jitsi-9378c38d9a688614165b73f8f7ce76b01501aecd.zip jitsi-9378c38d9a688614165b73f8f7ce76b01501aecd.tar.gz jitsi-9378c38d9a688614165b73f8f7ce76b01501aecd.tar.bz2 |
Fixes "Enter name of number" text being cut in the search field.
Diffstat (limited to 'src/net')
3 files changed, 7 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java index 4e32a24..99c9477 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java @@ -127,7 +127,7 @@ public class SearchFieldUI int dy = (c.getY() + c.getHeight()) / 2 - searchIcon.getIconHeight()/2; - g2.drawImage(searchIcon.getImage(), 5, dy + 1, null); + g2.drawImage(searchIcon.getImage(), 3, dy + 1, null); if (c.getText() != null && c.getText().length() > 0 @@ -171,11 +171,11 @@ public class SearchFieldUI if ((rect.width > 0) && (rect.height > 0)) { - rect.x += searchIcon.getIconWidth() + 8; - rect.width -= searchIcon.getIconWidth() + 8; + rect.x += searchIcon.getIconWidth() + 5; + rect.width -= (searchIcon.getIconWidth() + 5); - if (isCallButtonEnabled) - rect.width -= callRolloverIcon.getWidth(null) + 12; + if (isCallIconVisible) + rect.width -= (callRolloverIcon.getWidth(null) + 12); else rect.width -= 8; diff --git a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java index 54c04f6..81f0f40 100644 --- a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java +++ b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java @@ -160,6 +160,7 @@ public class SIPCommTextField { super.setText(defaultText); this.setForeground(defaultTextColor); + this.setCaretPosition(0); } /** diff --git a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java index 1b1a643..9c48dc2 100644 --- a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java +++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java @@ -307,7 +307,7 @@ public class SIPCommTextFieldUI */ protected Rectangle getVisibleEditorRect() { - if (!isDeleteButtonEnabled) + if (!isDeleteIconVisible) { return super.getVisibleEditorRect(); } |