[go: nahoru, domu]
Skip to content

Commit

Permalink
prep for 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@rabbibotton
rabbibotton committed Aug 18, 2022
1 parent c9bfb7b commit f305d8c
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 34 deletions.
4 changes: 2 additions & 2 deletions source/clog-canvas.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
;;;;;;;;;;;;;;;;;;;

(Defgeneric get-line-dash (clog-context2d)
(:documentation "Set line style dash pattern, e.g. [10, 20]"))
(:documentation "Set line style dash pattern, e.g. 10, 20"))

(defmethod get-line-dash ((obj clog-context2d))
(query obj (format nil "getLineDash()")))
Expand All @@ -197,7 +197,7 @@
;;;;;;;;;;;;;;;;;;;

(defgeneric set-line-dash (clog-context2d value)
(:documentation "Set line style dash pattern, e.g. [10, 20]"))
(:documentation "Set line style dash pattern, e.g. 10, 20"))

(defmethod set-line-dash ((obj clog-context2d) value)
(execute obj (format nil "setLineDash(~A)" value)))
Expand Down
34 changes: 17 additions & 17 deletions source/clog-element.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ element objects."))
CONNECTION-ID. There must be a single outer block that will be set to
an internal id. The returned CLOG-Element requires placement or will
not be visible, ie. place-after, etc. as it exists in the javascript
clog[] but is not in the DOM. If HTML-ID is nil one is generated.
clog array but is not in the DOM. If HTML-ID is nil one is generated.
(private)"
(let ((web-id (if html-id
html-id
Expand Down Expand Up @@ -245,17 +245,17 @@ after attachment is changed to one unique to this session."))

(defgeneric access-key (clog-element)
(:documentation "Get/Setf access-key. Used for hot key access to element.
[special key] + Access_Key
special key + Access_Key
The [special key] per browser and platform is:
The special key per browser and platform is:
Browser Windows Linux Mac
----------------- ------- ----- ---
Internet Explorer [Alt] N/A N/A
Chrome [Alt] [Alt] [Control][Alt]
Firefox [Alt][Shift] [Alt][Shift] [Control][Alt]
Safari [Alt] N/A [Control][Alt]
Opera 15+ [Alt] [Alt] [Alt]"))
Browser Windows Linux Mac
----------------- ------- ----- ---
Internet Explorer Alt N/A N/A
Chrome Alt Alt Control|Alt
Firefox Alt|Shift Alt|Shift Control|Alt
Safari Alt N/A Control|Alt
Opera 15+ Alt Alt Alt"))

(defmethod access-key ((obj clog-element))
(property obj "accessKey"))
Expand Down Expand Up @@ -823,12 +823,12 @@ handles how elements are treated by the browser layout engine.
order - sets visual item order in flexbox
align-self - override flexbox's align-items for item
:flex-start [--- ]
:flex-end [ ---]
:center [ --- ]
:space-between [- - -]
:space-around [ - - - ]
:space-evenly [ - - - ]
:flex-start (--- )
:flex-end ( ---)
:center ( --- )
:space-between (- - -)
:space-around ( - - - )
:space-evenly ( - - - )
grid - Turn this item in to a grid container block level. The grid
properties to adjust for container are:
Expand Down Expand Up @@ -1843,7 +1843,7 @@ is relative to origin of: padding-box|border-box|content-box"))

(defgeneric background-repeat (clog-element)
(:documentation "Get/Setf background-repeat. repeat-x | repeat-y |
[ repeat | space | round | no-repeat ]{1,2}"))
( repeat | space | round | no-repeat ) {1,2}"))

(defmethod background-repeat ((obj clog-element))
(style obj "background-repeat"))
Expand Down
1 change: 1 addition & 0 deletions source/clog-gui.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ the window will be set to keep-on-top always."))
(setf (content win) (attach-as-child win (format nil "~A-body" html-id)))
(setf (gethash (format nil "~A" html-id) (windows app)) win)
(set-on-click win (lambda (obj)
(declare (ignore obj))
(unless (> (modal-count app) 0)
(window-focus win))))
(if maximize
Expand Down
1 change: 1 addition & 0 deletions source/clog-system.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ example."
(declare (ignorable host
port
server
lack-middleware-list
extended-routing
long-poll-first
boot-file
Expand Down
31 changes: 17 additions & 14 deletions source/clog-webgl.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
(frame-buffer-attachment-parameter generic-function)
(parameter generic-function)
(render-buffer-parameter generic-function)
(texture-paramenter generic-function)
(texture-parameter generic-function)
(vertex-attribute generic-function)

(active-texture generic-function)
Expand Down Expand Up @@ -95,11 +95,11 @@
(create-shader generic-function)
(is-shader generic-function)

(shader-source generic-function)
(shader-parameter generic-function)
(shader-info-log generic-function)
(compile-shader generic-function)
(delete-shader generic-function)
(shader-source generic-function)
(shader-parameter generic-function)
(shader-info-log generic-function)
(compile-shader generic-function)
(delete-shader generic-function)

"CLOG-WebGL-Program - Class for CLOG WebGL-Program objects"
(clog-webgl-program class)
Expand Down Expand Up @@ -131,10 +131,10 @@
(delete-buffer generic-function)

"CLOG-WebGL-Vertex-Array - Class for CLOG WebGL-Vertex-Array objects"
(clog-vertex-array class)
(create-vertex-array generic-function)
(bind-vertex-array generic-function)
(delete-vertex-array generic-function)
(clog-webgl-vertex-array class)
(create-vertex-array generic-function)
(bind-vertex-array generic-function)
(delete-vertex-array generic-function)

"CLOG-WebGL-Frame-Buffer - Class for CLOG WebGL-Frame-Buffer objects"
(clog-webgl-frame-buffer class)
Expand Down Expand Up @@ -377,7 +377,7 @@ When using a WebGL 2 context, the following values are available additionally:
(defmethod blend-equation ((obj clog-webgl) glenum-mode)
(execute obj (format nil "blendEquation(~A.~A)" (script-id obj) glenum-mode)))

(defgeneric blend-equation-separate (clog-webgl glenum-mode-rgb glenum-mode-alpha)
(defgeneric blend-equation-seperate (clog-webgl glenum-mode-rgb glenum-mode-alpha)
(:documentation "Used to set both the RGB blend equation and alpha blend equation to a single equation.
:FUNC_ADD : source + destination (default value)
:FUNC_SUBTRACT : source - destination
Expand All @@ -388,7 +388,7 @@ When using a WebGL 2 context, the following values are available additionally:
:MIN : Minimum of source and destination
:MAX : Maximum of source and destination"))

(defmethod blend-equation-separate ((obj clog-webgl) glenum-mode-rgb glenum-mode-alpha)
(defmethod blend-equation-seperate ((obj clog-webgl) glenum-mode-rgb glenum-mode-alpha)
(execute obj (format nil "blendEquationSeparate(~A.~A,~A.~A)"
(script-id obj) glenum-mode-rgb
(script-id obj) glenum-mode-alpha)))
Expand Down Expand Up @@ -607,8 +607,8 @@ position."))

(defgeneric finish (clog-webgl)
(:documentation "Blocks execution until all previously called commands are
finished. [this needs to be written to fire an event when done to work fully
with CLOG]"))
finished. this needs to be written to fire an event when done to work fully
with CLOG"))

(defmethod finish ((obj clog-webgl))
(execute obj "finish()"))
Expand Down Expand Up @@ -894,6 +894,9 @@ For :GLENUM values"))
;; Properties - clog-webgl-shader
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(defgeneric shader-source (clog-webgl-shader source)
(:documentation "Sets shader source code"))

(defmethod (setf shader-source) (source (obj clog-webgl-shader))
(execute (gl obj) (format nil "shaderSource(~A, '~A')"
(script-id obj)
Expand Down
2 changes: 1 addition & 1 deletion source/clog.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ embedded in a native template application.)"
(blur generic-function)

"CLOG-Obj - Low Level"
(*store-new-objects* generic-function)
(*store-new-objects* variable)
(connection-data generic-function)
(connection-data-item generic-function)
(connection-body generic-function)
Expand Down

0 comments on commit f305d8c

Please sign in to comment.