Skip to content

Commit b87bdd6

Browse files
committed
switch to frame.scroll
1 parent 708c1a2 commit b87bdd6

26 files changed

+63
-63
lines changed

Modules/console.osl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ def run_ui() (
2727
c this.prim
2828
frame frame.left frame.top - 40 frame.right frame.bottom self.console.len * 20 "console_main" (
2929
c this.txt
30-
count = round(scroll_yconsole_main / 20)
31-
loc 2 2 10 -20 + (scroll_yconsole_main % 20)
30+
count = round(frame.scrollconsole_main / 20)
31+
loc 2 2 10 -20 + (frame.scrollconsole_main % 20)
3232
x = frame.left + 10
3333
loop floor(frame.height / 20) (
3434
count ++
35-
loc 2 2 10 scroll_yconsole_main - (20 * count)
35+
loc 2 2 10 frame.scrollconsole_main - (20 * count)
3636
text self.console[count] 10
3737
)
3838
)

OSL Programs/apps/Clipboard Character Info.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ text "View Your Clipboard Unicode Details!" 10
88

99
c #333
1010
frame window."left" window."top" - 40 window."right" window."bottom" clipboard.len * 20
11-
count = round(scroll_y / 20)
11+
count = round(frame.scroll / 20)
1212
start = 0
1313
loop round(window_height / 20) - 2 (
1414
count ++

OSL Programs/apps/Csv_Viewer.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if clicked and can (
5353
c #333
5454
frame window."left" window."top" - 50 window."right" window."bottom" table.len - 1 * 20
5555
each "i" "item" table (
56-
loc 2 2 20 -20 - ( i - 1 * 20 ) + scroll_y
56+
loc 2 2 20 -20 - ( i - 1 * 20 ) + frame.scroll
5757
each "i2" "item2" item (
5858
text item2.padEnd(15," ") ++ "|" 10 : c#fff
5959
)

OSL Programs/apps/Discord originOS_Server.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ i = 0
88
loop members.len (
99
i += 1
1010
current = members.[i]
11-
y = i * -50 + scroll_y
11+
y = i * -50 + frame.scroll
1212
loc 999 2 0 y
1313
square window_width - 30 30 10 1 : c#222
1414
loc 2 2 30 y

OSL Programs/apps/Github.osl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endef
1616
def "loadpage" "dir"
1717
network "get" url ++ dir
1818
if data != "Loading" (
19-
scroll_y = 0
19+
frame.scroll = 0
2020
if dir == "/repos" (
2121
names = data.getall("name")
2222
repo_stars = data.getall("stargazers_count")
@@ -59,11 +59,11 @@ if url.startsWith("https://api.github.com/users") (
5959
)
6060
c #222
6161
frame window.left + 300 window.top - 45 window.right window.bottom names.len * 110 - 27.5
62-
count = (scroll_y / 110).round - 1
62+
count = (frame.scroll / 110).round - 1
6363
len = names.len + 1
6464
loop ((frame_height / 110).round + 2).clamp(0,len) (
6565
count ++
66-
y = count * -110 + scroll_y + 55
66+
y = count * -110 + frame.scroll + 55
6767
loc 999 2 0 y
6868
square frame_width - 20 90 10 : c#222 hover_c#444
6969
if mouse_touching (
@@ -96,11 +96,11 @@ if url.startsWith("https://api.github.com/repos") (
9696
)
9797
)
9898

99-
count = scroll_y // 35
99+
count = frame.scroll // 35
100100
len = names.len
101101
loop (frame_height / 35).round.clamp(0,len) (
102102
count ++
103-
y = count - 1 * -35 + scroll_y - 20
103+
y = count - 1 * -35 + frame.scroll - 20
104104
loc 999 2 0 y
105105
square frame_width - 20 29 2 : c#000 hover_c#222
106106
loc 999 2 0 y + 17

OSL Programs/apps/Pijon.osl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ c #fff
4747
count = 0
4848
loop online.len (
4949
count ++
50-
loc 2 2 10 count * -20 + scroll_yusers
50+
loc 2 2 10 count * -20 + frame.scrollusers
5151
current = online[count]
5252
if current_target == current "change_x 10"
5353
text current 8
@@ -83,15 +83,15 @@ if "enter".pressed.not and mouse_down.not "can = true"
8383
c_msgs = messages.key(current_target)
8484
c #333
8585
frame window."left" + 240 window."top" - 40 window."right" window."bottom" + 40 c_msgs.len * 40
86-
count = scroll_y.divide(40).round
86+
count = frame.scroll.divide(40).round
8787
start = c_msgs.len - count
8888
loop frame_height.divide(40).round (
8989
count ++
9090
if count > c_msgs.len (
9191
frame "clear"
9292
exit
9393
)
94-
loc 2 2 30 10 - ( count * 40 ) + scroll_y
94+
loc 2 2 30 10 - ( count * 40 ) + frame.scroll
9595
current = c_msgs[count]
9696
image current_pfp 30
9797
text current[1].toStr() + ": " + current[2] 9 : c#fff chx#30

OSL Programs/apps/Proto.osl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ frame ww / -2 + sidebar_width + 10 wh / 2 - 50 ww / 2 wh / -2 len
8181
if page == "APPSTORE// store" (
8282
page_name = "Store"
8383
x = 0
84-
y = -75 + scroll_y
84+
y = -75 + frame.scroll
8585
len = 140
8686
per_line = 1
8787
count = 0
@@ -129,7 +129,7 @@ if app_page (
129129
count = 0
130130
loop versions.len (
131131
count += 1
132-
loc 999 2 0 -270 - ( scroll_y * 30 )
132+
loc 999 2 0 -270 - ( frame.scroll * 30 )
133133
square w - 10 60 10 1 : c#111
134134
)
135135
)

OSL Programs/apps/Repository_Viewer.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if loaded.not (
6868
count = 0
6969
loop json.len (
7070
count += 1
71-
y = count * -40 + 20 + scroll_y
71+
y = count * -40 + 20 + frame.scroll
7272
loc 999 2 0 y
7373
square frame_width - 20 25 10 : c#222
7474

OSL Programs/apps/System/.Install_system.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"path": "Origin/(A) System/System Apps",
103103
"name": "Find_Replace_Helper.osl",
104104
"icon": "c #111 w 10 square 0 0 5 5 c #fff icn edit 0.4",
105-
"version":"1.6"
105+
"version":"1.7"
106106
},
107107
{
108108
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Permission_Editor.osl",
@@ -137,7 +137,7 @@
137137
"path": "Origin/(A) System/System Apps",
138138
"name": "Terminal.osl",
139139
"icon": "c #1c452a w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 c #1b8f44 w 1.5 line 0 -4 4 -4 line -4 3 -1 0 cont -4 -3",
140-
"version":"6.5"
140+
"version":"6.6"
141141
},
142142
{
143143
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Quick_Settings.osl",
@@ -228,7 +228,7 @@
228228
"path": "Origin/(A) System/User Applications",
229229
"name": "Files.osl",
230230
"icon": "w 10 c #ff724f square 0 0 5 5 w 8 c #111 square 0 0 5 5 w 2.5 c #ff724f square -4 3 1 1 line -2.5 3.5 1.5 0 square 0 -1 5 2.5 w 4 square 0 -1 4 1",
231-
"version":"9.0"
231+
"version":"9.1"
232232
},
233233
{
234234
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Settings.osl",
@@ -249,21 +249,21 @@
249249
"path": "Origin/(A) System/User Applications",
250250
"name": "Activity.osl",
251251
"icon": "c #84d5f5 w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 w 1.5 c #84d5f5 line -7 0 -6 0 cont -5 2 cont -3 -2 cont -1 5 cont 2 -4 cont 4 0 cont 7 0",
252-
"version":"7.6"
252+
"version":"7.7"
253253
},
254254
{
255255
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Summit.osl",
256256
"path": "Origin/(A) System/User Applications",
257257
"name": "Summit.osl",
258258
"icon": "c #6a54b3 w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 c #6a54b3 w 1.5 line -5 -4 -2.5 1 cont -1 -1 line 0 -4 2.7 3 cont 5 -4",
259-
"version":"3.4"
259+
"version":"3.5"
260260
},
261261
{
262262
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Studio.osl",
263263
"path": "Origin/(A) System/User Applications",
264264
"name": "Studio.osl",
265265
"icon": "c #8e2d2d w 10 square 0 0 5 5 c #0a0303 w 8 square 0 0 5 5 dot 0 0 c #8e2d2d w 1.5 line 2 3 5 0 cont 2 -3 line -2 3 -5 0 cont -2 -3",
266-
"version":"7.6"
266+
"version":"7.7"
267267
},
268268
{
269269
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Contacts.osl",
@@ -298,7 +298,7 @@
298298
"path": "Origin/(A) System/User Applications",
299299
"name": "Wallet.osl",
300300
"icon": "c #ad7fb0 w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 square 0 0 5 5 c #ad7fb0 w 1 ellipse 0 0 7 0.45 100 ellipse 0 0 7 0.45 160 ellipse 0 0 7 0.45 220",
301-
"version":"3.0"
301+
"version":"3.1"
302302
},
303303
{
304304
"url": "https://origin.mistium.com/OSL%20Programs/apps/System/Previewer.osl",
@@ -312,7 +312,7 @@
312312
"path": "Origin/(A) System/User Applications",
313313
"name": "App Store.osl",
314314
"icon": "c #cfc45e w 10 square 0 0 5 5 c #111 w 8 square 0 0 5 5 dot 0 0 w 2 c #cfc45e square -3.5 3.5 2 2 square -3.5 -3.5 2 2 square 3.5 3.5 2 2 line 3.5 -2 3.5 -5 line 2 -3.5 5 -3.5 w 4 dot -3.5 -3.5 dot 3.5 3.5 dot -3.5 3.5",
315-
"version":"6.1"
315+
"version":"6.2"
316316
},
317317
{
318318
"url": "https://origin.mistium.com/OSL%20Programs/scripts/system/win_buttons.osl",

OSL Programs/apps/System/Activity.osl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ switch current_tab (
293293
loc -2 -2 0 0
294294
c prim
295295
frame x y x_position y_position windows_names.len * 40 (
296-
y = scroll_y - 20
296+
y = frame.scroll - 20
297297
tot = 0
298298
w = frame_width - 20
299299
for count windows_names.len (

0 commit comments

Comments
 (0)