mirrors/parin
1
0
Fork 0
mirror of https://github.com/Kapendev/parin.git synced 2025-05-09 12:18:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small wasm wrap fix and new ui items.

Browse source
This commit is contained in:
Kapendev 2024-12-15 01:30:09 +02:00
parent c99b306be7
commit 381d99461b
1 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

69
source/parin/engine.d
View file

@ -67,8 +67,8 @@ enum Filter : ubyte {
/// A type representing texture wrapping modes. /// A type representing texture wrapping modes.
enum Wrap : ubyte { enum Wrap : ubyte {
repeat = rl.TEXTURE_WRAP_REPEAT, // Repeats texture.
clamp = rl.TEXTURE_WRAP_CLAMP, // Clamps texture. clamp = rl.TEXTURE_WRAP_CLAMP, // Clamps texture.
repeat = rl.TEXTURE_WRAP_REPEAT, // Repeats texture.
} }
/// A type representing blending modes. /// A type representing blending modes.
@ -1715,7 +1715,7 @@ void setBorderColor(Color value) {
Font engineFont() { Font engineFont() {
auto result = rl.GetFontDefault().toParin(); auto result = rl.GetFontDefault().toParin();
result.runeSpacing = 1; result.runeSpacing = 1;
result.lineSpacing = 14; result.lineSpacing = 10;
return result; return result;
} }
@ -2578,9 +2578,32 @@ void wrapUiFocus(short step, Sz length) {
uiState.focusedItemId = wrap(cast(short) (uiState.focusedItemId + step), min, cast(short) (max + 1)); uiState.focusedItemId = wrap(cast(short) (uiState.focusedItemId + step), min, cast(short) (max + 1));
} }
void updateUiState(Vec2 itemPoint, Vec2 itemSize, bool isHot, bool isActive, bool isClicked) {
uiPreviousState = uiState;
uiState.itemPoint = itemPoint;
uiState.itemSize = itemSize;
uiState.itemId += 1;
final switch (uiState.layout) {
case Layout.v: uiState.startPointOffest.y += uiState.itemSize.y + uiState.margin; break;
case Layout.h: uiState.startPointOffest.x += uiState.itemSize.x + uiState.margin; break;
}
if (isHot) uiState.hotItemId = uiState.itemId;
if (isActive) {
uiState.activeItemId = uiState.itemId;
uiState.focusedItemId = uiState.itemId;
}
if (isClicked) uiState.clickedItemId = uiState.itemId;
if (uiState.draggedItemId) {
if (uiState.mouseClickAction.isReleased) uiState.draggedItemId = 0;
} else if (uiState.mouseClickAction.isPressed && uiState.itemId == uiState.activeItemId) {
auto m = uiMouse;
uiState.itemDragOffset = uiState.itemPoint - m;
uiState.draggedItemId = uiState.itemId;
}
}
bool updateUiButton(Vec2 size, IStr text, UiButtonOptions options = UiButtonOptions()) { bool updateUiButton(Vec2 size, IStr text, UiButtonOptions options = UiButtonOptions()) {
if (options.font.isEmpty) options.font = engineFont; if (options.font.isEmpty) options.font = engineFont;
// Update button.
auto m = uiMouse; auto m = uiMouse;
auto id = uiState.itemId + 1; auto id = uiState.itemId + 1;
auto area = Rect(uiState.startPoint + uiState.startPointOffest, size); auto area = Rect(uiState.startPoint + uiState.startPointOffest, size);
@ -2601,27 +2624,7 @@ bool updateUiButton(Vec2 size, IStr text, UiButtonOptions options = UiButtonOpti
if (uiState.keyboardClickAction.isReleased || uiState.gamepadClickAction.isReleased) isClicked = true; if (uiState.keyboardClickAction.isReleased || uiState.gamepadClickAction.isReleased) isClicked = true;
} }
} }
// Update state. updateUiState(area.position, size, isHot, isActive, isClicked);
uiPreviousState = uiState;
uiState.itemPoint = area.position;
uiState.itemSize = size;
uiState.itemId += 1;
final switch (uiState.layout) {
case Layout.v: uiState.startPointOffest.y += uiState.itemSize.y + uiState.margin; break;
case Layout.h: uiState.startPointOffest.x += uiState.itemSize.x + uiState.margin; break;
}
if (isHot) uiState.hotItemId = uiState.itemId;
if (isActive) {
uiState.activeItemId = uiState.itemId;
uiState.focusedItemId = uiState.itemId;
}
if (isClicked) uiState.clickedItemId = uiState.itemId;
if (uiState.draggedItemId) {
if (uiState.mouseClickAction.isReleased) uiState.draggedItemId = 0;
} else if (uiState.mouseClickAction.isPressed && uiState.itemId == uiState.activeItemId) {
uiState.itemDragOffset = area.position - m;
uiState.draggedItemId = uiState.itemId;
}
return isClicked; return isClicked;
} }
@ -2703,3 +2706,21 @@ bool uiDragHandle(Vec2 size, ref Vec2 point, UiButtonOptions options = UiButtonO
return false; return false;
} }
} }
void uiTexture(Texture texture, UiButtonOptions options = UiButtonOptions()) {
auto point = uiState.startPoint + uiState.startPointOffest;
drawTexture(texture, point);
updateUiState(point, texture.size, false, false, false);
}
void uiTexture(TextureId texture, UiButtonOptions options = UiButtonOptions()) {
uiTexture(texture.get(), options);
}
void uiText(IStr text, UiButtonOptions options = UiButtonOptions()) {
if (options.font.isEmpty) options.font = engineFont;
auto point = uiState.startPoint + uiState.startPointOffest;
auto size = measureTextSize(options.font, text);
drawText(options.font, text, point);
updateUiState(point, size, false, false, false);
}