Revert r10449 as possibly causing problems

cusax-fix
Tom Denham 13 years ago
parent f1700e3a12
commit a035f2c7ee

@ -1687,42 +1687,38 @@ public boolean isFrameVisible()
*/
public void setFrameVisible(final boolean isVisible)
{
if (this.isVisible() != isVisible)
{
ConfigurationUtils.setApplicationVisible(isVisible);
ConfigurationUtils.setApplicationVisible(isVisible);
SwingUtilities.invokeLater(new Runnable(){
public void run()
SwingUtilities.invokeLater(new Runnable(){
public void run()
{
if(isVisible)
{
if(isVisible)
{
MainFrame.this.addNativePlugins();
MainFrame.this.addNativePlugins();
Window focusedWindow = keyManager.getFocusedWindow();
Window focusedWindow = keyManager.getFocusedWindow();
// If there's another currently focused window we
// prevent this frame from steeling the focus. This
// happens for example in the case of a Master Password
// window which is opened before the contact list
// window.
if (focusedWindow != null)
setFocusableWindowState(false);
// If there's another currently focused window we prevent
// this frame from steeling the focus. This happens for
// example in the case of a Master Password window which is
// opened before the contact list window.
if (focusedWindow != null)
setFocusableWindowState(false);
MainFrame.super.setVisible(isVisible);
MainFrame.super.setVisible(isVisible);
if (focusedWindow != null)
setFocusableWindowState(true);
if (focusedWindow != null)
setFocusableWindowState(true);
MainFrame.super.setExtendedState(MainFrame.NORMAL);
MainFrame.super.toFront();
}
else
{
MainFrame.super.setVisible(isVisible);
}
MainFrame.super.setExtendedState(MainFrame.NORMAL);
MainFrame.super.toFront();
}
});
}
else
{
MainFrame.super.setVisible(isVisible);
}
}
});
}
/**

Loading…
Cancel
Save