Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
clim-tos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alastair Bridgewater
clim-tos
Commits
4335ce1a
Commit
4335ce1a
authored
7 years ago
by
Jacek Złydach
Browse files
Options
Downloads
Patches
Plain Diff
Resolved remaining missing slots in scroll-bar callbacks.
+ added address-book and thinkadot demos
parent
119c99f1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gramps-clim2.asd
+2
-2
2 additions, 2 deletions
gramps-clim2.asd
silica/scroll-pane.lisp
+27
-21
27 additions, 21 deletions
silica/scroll-pane.lisp
with
29 additions
and
23 deletions
gramps-clim2.asd
+
2
−
2
View file @
4335ce1a
...
@@ -216,8 +216,8 @@
...
@@ -216,8 +216,8 @@
;(:file "navdata" :depends-on ("packages"))
;(:file "navdata" :depends-on ("packages"))
;(:file "navfun" :depends-on ("navdata"))
;(:file "navfun" :depends-on ("navdata"))
(
:file
"puzzle"
:depends-on
(
"demo-driver"
))
(
:file
"puzzle"
:depends-on
(
"demo-driver"
))
;
(:file "address-book" :depends-on ("demo-driver"))
(
:file
"address-book"
:depends-on
(
"demo-driver"
))
;
(:file "thinkadot" :depends-on ("demo-driver"))
(
:file
"thinkadot"
:depends-on
(
"demo-driver"
))
;(:file "plot" :depends-on ("demo-driver"))
;(:file "plot" :depends-on ("demo-driver"))
;(:file "color-editor" :depends-on ("demo-driver"))
;(:file "color-editor" :depends-on ("demo-driver"))
;(:file "graphics-editor" :depends-on ("demo-driver"))
;(:file "graphics-editor" :depends-on ("demo-driver"))
...
...
This diff is collapsed.
Click to expand it.
silica/scroll-pane.lisp
+
27
−
21
View file @
4335ce1a
...
@@ -328,7 +328,9 @@
...
@@ -328,7 +328,9 @@
(
defmethod
scroll-line-to-top-callback
((
scroll-bar
scroll-bar-pane
)
(
defmethod
scroll-line-to-top-callback
((
scroll-bar
scroll-bar-pane
)
scroller-pane
id
orientation
x
y
)
scroller-pane
id
orientation
x
y
)
(
with-slots
(
current-size
current-value
)
scroll-bar
;; (with-slots (current-size current-value) scroll-bar) -- NOTE those slots don't exist. -- jacek.zlydach 2017-06-03
(
let
((
current-size
(
scroll-bar-size
scroll-bar
))
(
current-value
(
gadget-value
scroll-bar
)))
(
with-slots
(
viewport
contents
)
scroller-pane
(
with-slots
(
viewport
contents
)
scroller-pane
;; --- scroll-bar may not be the right thing if it's not the same
;; --- scroll-bar may not be the right thing if it's not the same
;; size as the contents pane - Davo 6/30/92.
;; size as the contents pane - Davo 6/30/92.
...
@@ -344,23 +346,25 @@
...
@@ -344,23 +346,25 @@
(
unless
(
zerop
contents-range
)
(
unless
(
zerop
contents-range
)
(
let*
((
viewport-range
(
viewport-range
scroller-pane
orientation
))
(
let*
((
viewport-range
(
viewport-range
scroller-pane
orientation
))
(
contents-min
(
contents-min
(
ecase
orientation
(
:horizontal
cleft
)
(
:vertical
ctop
)))
(
ecase
orientation
(
:horizontal
cleft
)
(
:vertical
ctop
)))
(
viewport-min
(
viewport-min
(
ecase
orientation
(
:horizontal
vleft
)
(
:vertical
vtop
)))
(
ecase
orientation
(
:horizontal
vleft
)
(
:vertical
vtop
)))
(
mouse-offset
(
mouse-offset
(
ecase
orientation
(
ecase
orientation
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
)))))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
)))))
(
pos
(
/
(
-
(
+
viewport-min
(
*
viewport-range
mouse-offset
))
(
pos
(
/
(
-
(
+
viewport-min
(
*
viewport-range
mouse-offset
))
contents-min
)
contents-min
)
contents-range
)))
contents-range
)))
(
scroll-bar-value-changed-callback
(
scroll-bar-value-changed-callback
scroll-bar
scroller-pane
id
scroll-bar
scroller-pane
id
pos
current-size
))))))))))
pos
current-size
))))))))))
(
defmethod
scroll-line-to-bottom-callback
((
scroll-bar
scroll-bar-pane
)
(
defmethod
scroll-line-to-bottom-callback
((
scroll-bar
scroll-bar-pane
)
scroller-pane
id
orientation
x
y
)
scroller-pane
id
orientation
x
y
)
(
with-slots
(
current-size
current-value
)
scroll-bar
;; (with-slots (current-size current-value) scroll-bar) -- NOTE those slots don't exist. -- jacek.zlydach 2017-06-03
(
let
((
current-size
(
scroll-bar-size
scroll-bar
))
(
current-value
(
gadget-value
scroll-bar
)))
(
with-slots
(
viewport
contents
)
scroller-pane
(
with-slots
(
viewport
contents
)
scroller-pane
;; --- scroll-bar may not be the right thing if its not the same
;; --- scroll-bar may not be the right thing if its not the same
;; size as the contents pane - Davo 6/30/92.
;; size as the contents pane - Davo 6/30/92.
...
@@ -376,34 +380,36 @@
...
@@ -376,34 +380,36 @@
(
unless
(
zerop
contents-range
)
(
unless
(
zerop
contents-range
)
(
let*
((
viewport-range
(
viewport-range
scroller-pane
orientation
))
(
let*
((
viewport-range
(
viewport-range
scroller-pane
orientation
))
(
contents-min
(
contents-min
(
ecase
orientation
(
:horizontal
cleft
)
(
:vertical
ctop
)))
(
ecase
orientation
(
:horizontal
cleft
)
(
:vertical
ctop
)))
(
viewport-min
(
viewport-min
(
ecase
orientation
(
:horizontal
vleft
)
(
:vertical
vtop
)))
(
ecase
orientation
(
:horizontal
vleft
)
(
:vertical
vtop
)))
(
mouse-offset
(
mouse-offset
(
ecase
orientation
(
ecase
orientation
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
)))))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
)))))
(
pos
(
/
(
-
(
+
viewport-min
(
*
viewport-range
mouse-offset
))
(
pos
(
/
(
-
(
+
viewport-min
(
*
viewport-range
mouse-offset
))
viewport-range
contents-min
)
viewport-range
contents-min
)
contents-range
)))
contents-range
)))
(
scroll-bar-value-changed-callback
(
scroll-bar-value-changed-callback
scroll-bar
scroller-pane
id
(
max
0
pos
)
current-size
))))))))))
scroll-bar
scroller-pane
id
(
max
0
pos
)
current-size
))))))))))
(
defmethod
scroll-elevator-callback
((
scroll-bar
scroll-bar-pane
)
(
defmethod
scroll-elevator-callback
((
scroll-bar
scroll-bar-pane
)
scroller-pane
id
orientation
x
y
)
scroller-pane
id
orientation
x
y
)
(
with-slots
(
current-size
current-value
)
scroll-bar
;; (with-slots (current-size current-value) scroll-bar) -- NOTE those slots don't exist. -- jacek.zlydach 2017-06-03
(
let
((
current-size
(
scroll-bar-size
scroll-bar
))
(
current-value
(
gadget-value
scroll-bar
)))
(
with-slots
(
viewport
contents
)
scroller-pane
(
with-slots
(
viewport
contents
)
scroller-pane
;; --- scroll-bar may not be the right thing if its not the same
;; --- scroll-bar may not be the right thing if its not the same
;; size as the contents pane - Davo 6/30/92.
;; size as the contents pane - Davo 6/30/92.
(
with-bounding-rectangle*
(
left
top
right
bottom
)
(
with-bounding-rectangle*
(
left
top
right
bottom
)
(
sheet-region
scroll-bar
)
(
sheet-region
scroll-bar
)
(
let*
((
mouse-offset
(
let*
((
mouse-offset
(
-
(
ecase
orientation
(
-
(
ecase
orientation
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:vertical
(
/
(
-
y
top
)
(
float
(
-
bottom
top
)
0.0s0
)))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
))))
(
:horizontal
(
/
(
-
x
left
)
(
float
(
-
right
left
)
0.0s0
))))
(
/
current-size
2.0s0
))))
(
/
current-size
2.0s0
))))
(
scroll-bar-value-changed-callback
(
scroll-bar-value-changed-callback
scroll-bar
scroller-pane
id
(
min
1.0s0
(
max
0.0s0
mouse-offset
))
current-size
))))))
scroll-bar
scroller-pane
id
(
min
1.0s0
(
max
0.0s0
mouse-offset
))
current-size
))))))
;;; Set the indicator to the proper size and location (size and value are between 0 and 1)
;;; Set the indicator to the proper size and location (size and value are between 0 and 1)
(
defmethod
change-scroll-bar-values
((
scroll-bar
scroll-bar-pane
)
(
defmethod
change-scroll-bar-values
((
scroll-bar
scroll-bar-pane
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment