AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 18:30:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed screen gui not necessarily using origin screen for information (power state and resolution)

Browse Source
This commit is contained in:
Florian Nücke 2014-01-11 13:24:12 +01:00
parent d0deb19664
commit 9370dd9658
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
li/cil/oc/client/gui/Screen.scala
View File

@ -24,7 +24,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
val mouseY = height - Mouse.getEventY * height / mc.displayHeight - 1 val mouseY = height - Mouse.getEventY * height / mc.displayHeight - 1
val bx = (mouseX - x - bufferMargin) / MonospaceFontRenderer.fontWidth + 1 val bx = (mouseX - x - bufferMargin) / MonospaceFontRenderer.fontWidth + 1
val by = (mouseY - y - bufferMargin) / MonospaceFontRenderer.fontHeight + 1 val by = (mouseY - y - bufferMargin) / MonospaceFontRenderer.fontHeight + 1
val (bw, bh) = screen.buffer.resolution val (bw, bh) = buffer.resolution
if (bx > 0 && by > 0 && bx <= bw && by <= bh) { if (bx > 0 && by > 0 && bx <= bw && by <= bh) {
val scroll = math.signum(Mouse.getEventDWheel) val scroll = math.signum(Mouse.getEventDWheel)
PacketSender.sendMouseScroll(buffer.owner, bx, by, scroll) PacketSender.sendMouseScroll(buffer.owner, bx, by, scroll)
@ -61,7 +61,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
private def clickOrDrag(mouseX: Int, mouseY: Int) { private def clickOrDrag(mouseX: Int, mouseY: Int) {
val bx = ((mouseX - x - bufferMargin) / scale / MonospaceFontRenderer.fontWidth).toInt + 1 val bx = ((mouseX - x - bufferMargin) / scale / MonospaceFontRenderer.fontWidth).toInt + 1
val by = ((mouseY - y - bufferMargin) / scale / MonospaceFontRenderer.fontHeight).toInt + 1 val by = ((mouseY - y - bufferMargin) / scale / MonospaceFontRenderer.fontHeight).toInt + 1
val (bw, bh) = screen.buffer.resolution val (bw, bh) = buffer.resolution
if (bx > 0 && by > 0 && bx <= bw && by <= bh) { if (bx > 0 && by > 0 && bx <= bw && by <= bh) {
if (bx != mx || by != my) { if (bx != mx || by != my) {
PacketSender.sendMouseClick(buffer.owner, bx, by, mx > 0 && my > 0) PacketSender.sendMouseClick(buffer.owner, bx, by, mx > 0 && my > 0)
@ -79,7 +79,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
def drawBuffer() { def drawBuffer() {
GL11.glTranslatef(x, y, 0) GL11.glTranslatef(x, y, 0)
BufferRenderer.drawBackground() BufferRenderer.drawBackground()
if (screen.hasPower) { if (screen.origin.hasPower) {
GL11.glTranslatef(bufferMargin, bufferMargin, 0) GL11.glTranslatef(bufferMargin, bufferMargin, 0)
RenderState.makeItBlend() RenderState.makeItBlend()
BufferRenderer.drawText() BufferRenderer.drawText()