thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-12-11 02:23:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve scrollbar rendering

Browse source
This commit is contained in:
RandomityGuy 2023-02-16 21:57:31 +05:30
parent f5b5729972
commit 3416445a73
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/gui/GuiScrollCtrl.hx
View file

@ -15,12 +15,16 @@ class GuiScrollCtrl extends GuiControl {
var maxScrollY:Float; var maxScrollY:Float;
var scrollBarY:Graphics; var scrollBarY:h2d.Object;
var scrollTopTile:Tile; var scrollTopTile:Tile;
var scrollBottomTile:Tile; var scrollBottomTile:Tile;
var scrollFillTile:Tile; var scrollFillTile:Tile;
var scrollTopBmp:h2d.Bitmap;
var scrollBottomBmp:h2d.Bitmap;
var scrollFillBmp:h2d.Bitmap;
var scrollTopPressedTile:Tile; var scrollTopPressedTile:Tile;
var scrollBottomPressedTile:Tile; var scrollBottomPressedTile:Tile;
var scrollFillPressedTile:Tile; var scrollFillPressedTile:Tile;
@ -39,7 +43,13 @@ class GuiScrollCtrl extends GuiControl {
this.scrollTopPressedTile = scrollBar.sub(11, 4, 10, 6); this.scrollTopPressedTile = scrollBar.sub(11, 4, 10, 6);
this.scrollBottomPressedTile = scrollBar.sub(11, 13, 10, 6); this.scrollBottomPressedTile = scrollBar.sub(11, 13, 10, 6);
this.scrollFillPressedTile = scrollBar.sub(11, 11, 10, 1); this.scrollFillPressedTile = scrollBar.sub(11, 11, 10, 1);
this.scrollBarY = new Graphics(); this.scrollBarY = new h2d.Object();
scrollTopBmp = new h2d.Bitmap(scrollTopTile);
scrollBottomBmp = new h2d.Bitmap(scrollBottomTile);
scrollFillBmp = new h2d.Bitmap(scrollFillTile);
this.scrollBarY.addChild(scrollTopBmp);
this.scrollBarY.addChild(scrollBottomBmp);
this.scrollBarY.addChild(scrollFillBmp);
this.scrollBarY.scale(Settings.uiScale); this.scrollBarY.scale(Settings.uiScale);
this.clickInteractive = new Interactive(10 * Settings.uiScale, 1); this.clickInteractive = new Interactive(10 * Settings.uiScale, 1);
this.clickInteractive.onPush = (e) -> { this.clickInteractive.onPush = (e) -> {
@ -108,15 +118,20 @@ class GuiScrollCtrl extends GuiControl {
var renderRect = this.getRenderRectangle(); var renderRect = this.getRenderRectangle();
if (maxScrollY < renderRect.extent.y) { if (maxScrollY < renderRect.extent.y) {
scrollBarY.clear(); scrollBarY.visible = false;
return; return;
} }
scrollBarY.visible = true;
var scrollBarYSize = renderRect.extent.y * renderRect.extent.y / (maxScrollY * Settings.uiScale); var scrollBarYSize = renderRect.extent.y * renderRect.extent.y / (maxScrollY * Settings.uiScale);
var scrollYOld = scrollY;
this.scrollY = Util.clamp(scrollY, 0, renderRect.extent.y - scrollBarYSize * Settings.uiScale); this.scrollY = Util.clamp(scrollY, 0, renderRect.extent.y - scrollBarYSize * Settings.uiScale);
this.scrollBarY.setPosition(renderRect.position.x + renderRect.extent.x - 10 * Settings.uiScale, renderRect.position.y + scrollY); scrollBarYSize = Math.max(scrollBarYSize, 13);
var visScrollY = Util.clamp(scrollYOld, 0, renderRect.extent.y - scrollBarYSize * Settings.uiScale);
this.scrollBarY.setPosition(renderRect.position.x + renderRect.extent.x - 10 * Settings.uiScale, renderRect.position.y + visScrollY);
this.clickInteractive.setPosition(renderRect.position.x + renderRect.extent.x - 10 * Settings.uiScale, renderRect.position.y); this.clickInteractive.setPosition(renderRect.position.x + renderRect.extent.x - 10 * Settings.uiScale, renderRect.position.y);
@ -125,19 +140,25 @@ class GuiScrollCtrl extends GuiControl {
if (this.dirty) { if (this.dirty) {
if (scrollBarYSize > renderRect.extent.y) { if (scrollBarYSize > renderRect.extent.y) {
scrollBarYSize = renderRect.extent.y; scrollBarYSize = renderRect.extent.y;
scrollBarY.clear(); scrollBarY.visible = false;
return; return;
} }
scrollBarY.clear(); // scrollBarY.clear();
scrollBarY.drawTile(0, 0, pressed ? scrollTopPressedTile : scrollTopTile); scrollTopBmp.tile = pressed ? scrollTopPressedTile : scrollTopTile;
scrollBottomBmp.tile = pressed ? scrollBottomPressedTile : scrollBottomTile;
scrollFillBmp.tile = pressed ? scrollFillPressedTile : scrollFillTile;
scrollBottomBmp.y = scrollBarYSize - 6;
scrollFillBmp.y = 6;
scrollFillBmp.scaleY = scrollBarYSize - 12;
// scrollBarY.drawTile(0, 0, pressed ? scrollTopPressedTile : scrollTopTile);
// :skull: // :skull:
for (i in 0...cast(scrollBarYSize - 12)) { // for (i in 0...cast(scrollBarYSize - 12)) {
scrollBarY.drawTile(0, i + 6, pressed ? scrollFillPressedTile : scrollFillTile); // scrollBarY.drawTile(0, i + 6, pressed ? scrollFillPressedTile : scrollFillTile);
} // }
scrollBarY.drawTile(0, scrollBarYSize - 6, pressed ? scrollBottomPressedTile : scrollBottomTile); // scrollBarY.drawTile(0, scrollBarYSize - 6, pressed ? scrollBottomPressedTile : scrollBottomTile);
this.dirty = false; this.dirty = false;
} }