mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 21:59:05 +00:00
Merge remote-tracking branch 'origin/janino-scripts' into janino-scripts
This commit is contained in:
commit
1ac7c0e797
4 files changed
+58
-6
No files matched your search
@@ -261,6 +261,11 @@ public class GuiScriptTextArea extends GuiNpcTextField {
|
||||
}
|
||||
// Draw outer border around entire area
|
||||
drawRect(x - 1, y - 1, x + width + 1, y + height + 1, 0xffa0a0a0);
|
||||
|
||||
int searchHeight = searchBar.getTotalHeight();
|
||||
y += searchHeight;
|
||||
height -= searchHeight;
|
||||
|
||||
// Draw line number gutter background
|
||||
drawRect(x, y, x + LINE_NUMBER_GUTTER_WIDTH, y + height, 0xff000000);
|
||||
// Draw text viewport background (starts after gutter)
|
||||
@@ -271,8 +276,8 @@ public class GuiScriptTextArea extends GuiNpcTextField {
|
||||
// Enable scissor test to clip drawing to the TEXT viewport rectangle (excludes gutter)
|
||||
GL11.glEnable(GL11.GL_SCISSOR_TEST);
|
||||
scissorViewport();
|
||||
|
||||
container.visibleLines = height / container.lineHeight-1;
|
||||
|
||||
container.visibleLines = (height / container.lineHeight);
|
||||
|
||||
int maxScroll = Math.max(0, this.container.linesCount - container.visibleLines);
|
||||
|
||||
@@ -550,6 +555,8 @@ public class GuiScriptTextArea extends GuiNpcTextField {
|
||||
goToLineDialog.draw(xMouse, yMouse);
|
||||
|
||||
KEYS_OVERLAY.draw(xMouse, yMouse, wheelDelta);
|
||||
y -= searchHeight;
|
||||
height += searchHeight;
|
||||
}
|
||||
|
||||
private void scissorViewport() {
|
||||
|
||||
Reference in new issue
Block a user