gui: more work on dialogs.

avr/modules/lcd2/gui/base/cwidget.asm

@@ -72,6 +72,8 @@
 ; @param Y      pointer to target object for signals emitted by child widgets
 ; @param X      pointer to window to become parent for the new widget
 ; @param Z      pointer to dialog configuration
+; @param r16    value for OBJECT_OFFS_OPTS
+; @param r17    value for WIDGET_OFFS_PACK
 ; @return CFLAG set of okay, cleared otherwise
 ; @return Y     pointer to created content widget
 
@@ -133,29 +135,30 @@ CWidget_CreateChildWidgets_ret:
 ; @param Y      pointer to main window
 ; @param X      pointer to content window of MainWindow (is a VLayout, becomes parent)
 ; @param Z      pointer to dialog configuration
+; @param r16    value for OBJECT_OFFS_OPTS
+; @param r17    value for WIDGET_OFFS_PACK
 ; @return CFLAG set of okay, cleared otherwise
 ; @return Y     pointer to created content widget
 ; @clobbers any, !Z
 
 cWidgetMkMainWidget:
-  lpm r16, Z
-  cpi r16, CWIDGETCFG_MAINWIDGET_TYPE_NEXT
+  lpm r18, Z
+  cpi r18, CWIDGETCFG_MAINWIDGET_TYPE_NEXT
   brcc cWidgetMkMainWidget_ret
-  dec r16
+  dec r18
 
-  clr r17
-  ldi r18, LOW(cWidgetMkMainWidget_table)
-  ldi r19, HIGH(cWidgetMkMainWidget_table)
-  add r18, r16
-  adc r19, r17
+  ; determine location in calltable
+  clr r19
+  ldi r20, LOW(cWidgetMkMainWidget_table)
+  ldi r21, HIGH(cWidgetMkMainWidget_table)
+  add r18, r20
+  adc r19, r21
 
-  ; prepare params, opts and pack
+  ; prepare params
   adiw zh:zl, CWIDGETCFG_OFFS_HEADER_PARAM1
   lpm r20, Z+
   lpm r21, Z
   sbiw zh:zl, (CWIDGETCFG_OFFS_HEADER_PARAM1+1)
-  ldi r16, 0                                                                                           ; OPTS
-  ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
 
   push zl
     push zh