sigonasr2/sigIRCv2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix issue with messages not displaying in regular (non-Overlay) mode.

Browse Source
This commit is contained in:
sigonasr2 2017-04-13 21:36:36 -05:00
parent b39c2cf980
commit 15efa2f45a
4 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sigIRCv2.jar
View File

Binary file not shown.

17
src/sig/MyPanel.java
View File

@ -72,15 +72,18 @@ public class MyPanel extends JPanel implements MouseListener, ActionListener, Mo
}*/ }*/
// //
for (int i=0;i<sigIRC.textobj.size();i++) { for (int i=0;i<sigIRC.textobj.size();i++) {
if (sigIRC.textobj.get(i).isActive() && sigIRC.overlayMode) { if (sigIRC.textobj.get(i).isActive()) {
if (!sigIRC.textobj.get(i).intersects(lastMouseX,lastMouseY)) { if (sigIRC.overlayMode) {
sigIRC.textobj.get(i).setVisible(true); if (!sigIRC.textobj.get(i).intersects(lastMouseX,lastMouseY)) {
sigIRC.textobj.get(i).draw(g); sigIRC.textobj.get(i).setVisible(true);
sigIRC.textobj.get(i).draw(g);
} else {
System.out.println("Setting to False.");
sigIRC.textobj.get(i).setVisible(false);
}
} else { } else {
sigIRC.textobj.get(i).setVisible(false); sigIRC.textobj.get(i).draw(g);
} }
} else {
break;
} }
} }
for (Module m : sigIRC.modules) { for (Module m : sigIRC.modules) {

2
src/sig/ScrollingText.java
View File

@ -157,7 +157,7 @@ public class ScrollingText {
} }
public void setVisible(boolean isVisible) { public void setVisible(boolean isVisible) {
this.visible=visible; this.visible=isVisible;
} }
public void draw(Graphics g) { public void draw(Graphics g) {

56
src/sig/UpdateEvent.java
View File

@ -18,34 +18,36 @@ public class UpdateEvent implements ActionListener{
} }
private void UpdateAuthenticationCountdownMessage() { private void UpdateAuthenticationCountdownMessage() {
if (!sigIRC.authenticated && last_authentication_msg<MSGTIMER) { if (sigIRC.downloadsComplete) {
last_authentication_msg++; if (!sigIRC.authenticated && last_authentication_msg<MSGTIMER) {
} else last_authentication_msg++;
if (!sigIRC.authenticated && last_authentication_msg>=MSGTIMER) { } else
last_authentication_msg=0; if (!sigIRC.authenticated && last_authentication_msg>=MSGTIMER) {
sigIRC.panel.addMessage("SYSTEM: Your oauthToken was not successful. Please go to the sigIRC folder and make sure your oauthToken.txt file is correct!!! SwiftRage"); last_authentication_msg=0;
sigIRC.panel.addMessage("SYSTEM: Your oauthToken was not successful. Please go to the sigIRC folder and make sure your oauthToken.txt file is correct!!! SwiftRage");
}
if (last_autosave<AUTOSAVETIMER) {
last_authentication_msg++;
} else
if (last_autosave>=AUTOSAVETIMER) {
last_autosave=0;
sigIRC.windowX = sigIRC.window.getX();
sigIRC.windowY = sigIRC.window.getY();
sigIRC.windowWidth = sigIRC.window.getWidth();
sigIRC.windowHeight = sigIRC.window.getHeight();
sigIRC.config.setInteger("windowX", sigIRC.windowX);
sigIRC.config.setInteger("windowY", sigIRC.windowY);
sigIRC.config.setInteger("windowWidth", sigIRC.windowWidth);
sigIRC.config.setInteger("windowHeight", sigIRC.windowHeight);
sigIRC.config.saveProperties();
}
if (sigIRC.lastPlayedDing>0) {
sigIRC.lastPlayedDing--;
}
updateFPSCounter();
sigIRC.window.setTitle("sigIRCv2 - "+(avgfps)+" FPS");
lasttime=System.currentTimeMillis();
} }
if (last_autosave<AUTOSAVETIMER) {
last_authentication_msg++;
} else
if (last_autosave>=AUTOSAVETIMER) {
last_autosave=0;
sigIRC.windowX = sigIRC.window.getX();
sigIRC.windowY = sigIRC.window.getY();
sigIRC.windowWidth = sigIRC.window.getWidth();
sigIRC.windowHeight = sigIRC.window.getHeight();
sigIRC.config.setInteger("windowX", sigIRC.windowX);
sigIRC.config.setInteger("windowY", sigIRC.windowY);
sigIRC.config.setInteger("windowWidth", sigIRC.windowWidth);
sigIRC.config.setInteger("windowHeight", sigIRC.windowHeight);
sigIRC.config.saveProperties();
}
if (sigIRC.lastPlayedDing>0) {
sigIRC.lastPlayedDing--;
}
updateFPSCounter();
sigIRC.window.setTitle("sigIRCv2 - "+(avgfps)+" FPS");
lasttime=System.currentTimeMillis();
} }
public void updateFPSCounter() { public void updateFPSCounter() {