berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

canvas pane scroll bars

This commit is contained in:
nakst 2021-09-19 12:06:41 +01:00
parent bae0cc032e
commit ee87c4a789
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
desktop/gui.cpp
View File

@ -313,6 +313,7 @@ struct ScrollPane {
uint8_t mode[2]; uint8_t mode[2];
#define SCROLL_X_DRAG (1 << 0) #define SCROLL_X_DRAG (1 << 0)
#define SCROLL_Y_DRAG (1 << 1) #define SCROLL_Y_DRAG (1 << 1)
#define SCROLL_MANUAL (1 << 2) // The parent is responsible for updating the position of the scroll bars.
uint16_t flags; uint16_t flags;
void Setup(EsElement *parent, uint8_t xMode, uint8_t yMode, uint16_t flags); void Setup(EsElement *parent, uint8_t xMode, uint8_t yMode, uint16_t flags);
@ -2922,8 +2923,10 @@ void ScrollPane::Refresh() {
if (bar[0]) ScrollbarSetMeasurements(bar[0], bounds.r - fixedViewport[0], contentWidth - fixedViewport[0]); if (bar[0]) ScrollbarSetMeasurements(bar[0], bounds.r - fixedViewport[0], contentWidth - fixedViewport[0]);
if (bar[1]) ScrollbarSetMeasurements(bar[1], bounds.b - fixedViewport[1], contentHeight - fixedViewport[1]); if (bar[1]) ScrollbarSetMeasurements(bar[1], bounds.b - fixedViewport[1], contentHeight - fixedViewport[1]);
if (~flags & SCROLL_MANUAL) {
SetPosition(0, position[0], true); SetPosition(0, position[0], true);
SetPosition(1, position[1], true); SetPosition(1, position[1], true);
}
EsRectangle border = parent->currentStyle->borders; EsRectangle border = parent->currentStyle->borders;
@ -3539,6 +3542,7 @@ struct EsCanvasPane : EsElement {
bool zoomFit, contentsChanged, center; bool zoomFit, contentsChanged, center;
int previousWidth, previousHeight; int previousWidth, previousHeight;
EsPoint lastPanPoint; EsPoint lastPanPoint;
ScrollPane scroll;
}; };
EsElement *CanvasPaneGetCanvas(EsElement *element) { EsElement *CanvasPaneGetCanvas(EsElement *element) {
@ -3554,6 +3558,8 @@ EsElement *CanvasPaneGetCanvas(EsElement *element) {
int ProcessCanvasPaneMessage(EsElement *element, EsMessage *message) { int ProcessCanvasPaneMessage(EsElement *element, EsMessage *message) {
EsCanvasPane *pane = (EsCanvasPane *) element; EsCanvasPane *pane = (EsCanvasPane *) element;
pane->scroll.ReceivedMessage(message);
if (message->type == ES_MSG_LAYOUT) { if (message->type == ES_MSG_LAYOUT) {
EsElement *canvas = CanvasPaneGetCanvas(element); EsElement *canvas = CanvasPaneGetCanvas(element);
if (!canvas) return 0; if (!canvas) return 0;
@ -3594,6 +3600,11 @@ int ProcessCanvasPaneMessage(EsElement *element, EsMessage *message) {
pane->panY = height / 2 - Height(bounds) / pane->zoom / 2; pane->panY = height / 2 - Height(bounds) / pane->zoom / 2;
} }
pane->scroll.position[0] = pane->panX;
pane->scroll.position[1] = pane->panY;
ScrollbarSetPosition(pane->scroll.bar[0], pane->panX, false, false);
ScrollbarSetPosition(pane->scroll.bar[1], pane->panY, false, false);
pane->center = false; pane->center = false;
int x = (int) (0.5f + LinearMap(pane->panX, pane->panX + Width(bounds) / pane->zoom, 0, Width(bounds), 0)); int x = (int) (0.5f + LinearMap(pane->panX, pane->panX + Width(bounds) / pane->zoom, 0, Width(bounds), 0));
@ -3608,15 +3619,24 @@ int ProcessCanvasPaneMessage(EsElement *element, EsMessage *message) {
} else if (message->type == ES_MSG_MOUSE_MIDDLE_DOWN) { } else if (message->type == ES_MSG_MOUSE_MIDDLE_DOWN) {
pane->lastPanPoint = EsMouseGetPosition(pane); pane->lastPanPoint = EsMouseGetPosition(pane);
} else if (message->type == ES_MSG_MOUSE_MIDDLE_DRAG) { } else if (message->type == ES_MSG_MOUSE_MIDDLE_DRAG) {
// TODO Set cursor.
EsPoint point = EsMouseGetPosition(pane); EsPoint point = EsMouseGetPosition(pane);
pane->zoomFit = false; pane->zoomFit = false;
pane->panX -= (float) (point.x - pane->lastPanPoint.x) / pane->zoom; pane->panX -= (point.x - pane->lastPanPoint.x) / pane->zoom;
pane->panY -= (float) (point.y - pane->lastPanPoint.y) / pane->zoom; pane->panY -= (point.y - pane->lastPanPoint.y) / pane->zoom;
pane->lastPanPoint = point; pane->lastPanPoint = point;
EsElementRelayout(pane); EsElementRelayout(pane);
} else if (message->type == ES_MSG_GET_CURSOR && pane->window->dragged == pane) { } else if (message->type == ES_MSG_GET_CURSOR && pane->window->dragged == pane) {
message->cursorStyle = ES_CURSOR_HAND_DRAG; message->cursorStyle = ES_CURSOR_HAND_DRAG;
} else if (message->type == ES_MSG_GET_WIDTH) {
EsElement *canvas = CanvasPaneGetCanvas(element);
message->measure.width = canvas ? canvas->GetWidth(message->measure.height) : 0;
} else if (message->type == ES_MSG_GET_HEIGHT) {
EsElement *canvas = CanvasPaneGetCanvas(element);
message->measure.height = canvas ? canvas->GetHeight(message->measure.width) : 0;
} else if (message->type == ES_MSG_SCROLL_X || message->type == ES_MSG_SCROLL_Y) {
pane->panX = pane->scroll.position[0];
pane->panY = pane->scroll.position[1];
EsElementRelayout(pane);
} else { } else {
return 0; return 0;
} }
@ -3630,6 +3650,7 @@ EsCanvasPane *EsCanvasPaneCreate(EsElement *parent, uint64_t flags, const EsStyl
pane->Initialise(parent, flags, ProcessCanvasPaneMessage, style); pane->Initialise(parent, flags, ProcessCanvasPaneMessage, style);
pane->cName = "canvas pane"; pane->cName = "canvas pane";
pane->zoom = 1.0; pane->zoom = 1.0;
pane->scroll.Setup(pane, SCROLL_MODE_AUTO, SCROLL_MODE_AUTO, SCROLL_MANUAL);
return pane; return pane;
} }