3
0
mirror of https://github.com/britzl/monarch.git synced 2025-09-27 18:12:22 +02:00

Improve transition setup

This commit is contained in:
Björn Ritzl
2023-03-29 09:19:49 +02:00
parent e0b0a286e3
commit a055af032f
7 changed files with 75 additions and 42 deletions

View File

@@ -58,11 +58,6 @@ embedded_instances {
" value: \"window1\"\n"
" type: PROPERTY_TYPE_HASH\n"
" }\n"
" properties {\n"
" id: \"transition_url\"\n"
" value: \"window1:/go\"\n"
" type: PROPERTY_TYPE_URL\n"
" }\n"
" property_decls {\n"
" }\n"
"}\n"
@@ -123,11 +118,6 @@ embedded_instances {
" value: \"window2\"\n"
" type: PROPERTY_TYPE_HASH\n"
" }\n"
" properties {\n"
" id: \"transition_url\"\n"
" value: \"window2:/go\"\n"
" type: PROPERTY_TYPE_URL\n"
" }\n"
" property_decls {\n"
" }\n"
"}\n"

View File

@@ -47,7 +47,7 @@ nodes {
xanchor: XANCHOR_NONE
yanchor: YANCHOR_NONE
pivot: PIVOT_CENTER
adjust_mode: ADJUST_MODE_FIT
adjust_mode: ADJUST_MODE_STRETCH
layer: ""
inherit_alpha: true
slice9 {

View File

@@ -2,12 +2,16 @@ local monarch = require "monarch.monarch"
local transitions = require "monarch.transitions.gui"
function init(self)
print("window2", msg.url())
self.transition = transitions.create(gui.get_node("bg"))
.show_in(transitions.slide_in_right, gui.EASING_LINEAR, 0.3, 0)
.show_out(transitions.slide_out_left, gui.EASING_LINEAR, 0.3, 0)
.back_in(transitions.slide_in_left, gui.EASING_LINEAR, 0.3, 0)
.back_out(transitions.slide_out_right, gui.EASING_LINEAR, 0.3, 0)
print("window1", msg.url())
local DURATION = 1
local transition = transitions.create(gui.get_node("bg"))
.show_in(transitions.slide_in_right, gui.EASING_LINEAR, DURATION, 0)
.show_out(transitions.slide_out_left, gui.EASING_LINEAR, DURATION, 0)
.back_in(transitions.slide_in_left, gui.EASING_LINEAR, DURATION, 0)
.back_out(transitions.slide_out_right, gui.EASING_LINEAR, DURATION, 0)
monarch.on_transition("window1", transition)
msg.post(".", "acquire_input_focus")
end
@@ -21,5 +25,5 @@ function on_input(self, action_id, action)
end
function on_message(self, message_id, message, sender)
self.transition.handle(message_id, message, sender)
monarch.on_message(message_id, message, sender)
end

View File

@@ -47,7 +47,7 @@ nodes {
xanchor: XANCHOR_NONE
yanchor: YANCHOR_NONE
pivot: PIVOT_CENTER
adjust_mode: ADJUST_MODE_FIT
adjust_mode: ADJUST_MODE_STRETCH
layer: ""
inherit_alpha: true
slice9 {

View File

@@ -3,11 +3,15 @@ local transitions = require "monarch.transitions.gui"
function init(self)
print("window2", msg.url())
self.transition = transitions.create(gui.get_node("bg"))
.show_in(transitions.slide_in_right, gui.EASING_LINEAR, 0.3, 0)
.show_out(transitions.slide_out_left, gui.EASING_LINEAR, 0.3, 0)
.back_in(transitions.slide_in_left, gui.EASING_LINEAR, 0.3, 0)
.back_out(transitions.slide_out_right, gui.EASING_LINEAR, 0.3, 0)
local DURATION = 1
local transition = transitions.create(gui.get_node("bg"))
.show_in(transitions.slide_in_right, gui.EASING_LINEAR, DURATION, 0)
.show_out(transitions.slide_out_left, gui.EASING_LINEAR, DURATION, 0)
.back_in(transitions.slide_in_left, gui.EASING_LINEAR, DURATION, 0)
.back_out(transitions.slide_out_right, gui.EASING_LINEAR, DURATION, 0)
monarch.on_transition("window2", transition)
msg.post(".", "acquire_input_focus")
end
@@ -21,5 +25,5 @@ function on_input(self, action_id, action)
end
function on_message(self, message_id, message, sender)
self.transition.handle(message_id, message, sender)
monarch.on_message(message_id, message, sender)
end