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

Fix Window Dragging going out of bounds.

Browse Source
This commit is contained in:
sigonasr2 2017-10-25 12:09:09 -05:00
parent 70e91c46a2
commit 52f2419a3d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sigIRCv2.jar
View File

Binary file not shown.

3
src/sig/Module.java
View File

@ -106,7 +106,7 @@ public class Module {
int mouseY = sigIRC.panel.lastMouseY+(int)dragOffset.getY(); int mouseY = sigIRC.panel.lastMouseY+(int)dragOffset.getY();
int oldX = (int)position.getX(); int oldX = (int)position.getX();
int oldY = (int)position.getY(); int oldY = (int)position.getY();
position = new Rectangle(mouseX, mouseY,(int)position.getWidth(),(int)position.getHeight()); position = new Rectangle((int)Math.min(Math.max(0,mouseX),sigIRC.window.getWidth()-position.getWidth()), (int)Math.min(Math.max(titleHeight,mouseY),sigIRC.window.getHeight()-position.getHeight()-titleHeight*2),(int)position.getWidth(),(int)position.getHeight());
//System.out.println(sigIRC.panel.lastMouseX+","+sigIRC.panel.lastMouseY); //System.out.println(sigIRC.panel.lastMouseX+","+sigIRC.panel.lastMouseY);
ModuleDragEvent(oldX,oldY,mouseX,mouseY); ModuleDragEvent(oldX,oldY,mouseX,mouseY);
} }
@ -145,6 +145,7 @@ public class Module {
Module.IMG_DRAGBAR.getHeight(), Module.IMG_DRAGBAR.getHeight(),
sigIRC.panel); sigIRC.panel);
DrawUtils.drawTextFont(g, sigIRC.panel.smallFont, (int)position.getX(), (int)position.getY()-titleHeight/2+4, Color.BLACK, this.name); DrawUtils.drawTextFont(g, sigIRC.panel.smallFont, (int)position.getX(), (int)position.getY()-titleHeight/2+4, Color.BLACK, this.name);
//g.fillRect((int)position.getX(), (int)position.getY(), (int)position.getWidth(), (int)position.getHeight());
} }
} }

6
src/sig/modules/ControllerModule.java
View File

@ -143,6 +143,7 @@ public class ControllerModule extends Module{
Math.abs((end_drag.getY()-start_drag.getY())/controller_img.getHeight(sigIRC.panel))); Math.abs((end_drag.getY()-start_drag.getY())/controller_img.getHeight(sigIRC.panel)));
//buttons.add(new Button(pct_rect.getX(),pct_rect.getY(),pct_rect.getWidth(),pct_rect.getHeight(),controllers.get(0),Identifier.Button._3,Color.RED,this)); //buttons.add(new Button(pct_rect.getX(),pct_rect.getY(),pct_rect.getWidth(),pct_rect.getHeight(),controllers.get(0),Identifier.Button._3,Color.RED,this));
//resetDragPoints(); //resetDragPoints();
sigIRC.panel.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
MODE=EditMode.BUTTONSET; MODE=EditMode.BUTTONSET;
} }
} }
@ -185,7 +186,6 @@ public class ControllerModule extends Module{
status="Drag a button onto the controller template."; status="Drag a button onto the controller template.";
}break; }break;
case BUTTONSET:{ case BUTTONSET:{
sigIRC.panel.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
status="Press controller button to set button"; status="Press controller button to set button";
}break; }break;
case COLORSET:{ case COLORSET:{
@ -193,10 +193,6 @@ public class ControllerModule extends Module{
}break; }break;
default:{ default:{
status=""; status="";
int cursortype = sigIRC.panel.getCursor().getType();
if (cursortype!=Cursor.DEFAULT_CURSOR) {
sigIRC.panel.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
}
} }
} }
super.run(); super.run();