dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2422:4a353a83b2e4

iOS: Initial attempt at implementing check and radio boxes using SF Symbols.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 04 Apr 2021 01:23:56 +0000
parents	d88928a85436
children	b4cb136b5222

comparison

equal deleted inserted replaced

-:d88928a85436
+:4a353a83b2e4
 *          A GTK like implementation of the iOS GUI
 *
 * (C) 2011-2021 Brian Smith <brian@dbsoft.org>
 * (C) 2011-2018 Mark Hessling <mark@rexx.org>
 *
-* Requires 10.0 or later.
+* Requires 13.0 or later.
 * clang -g -o dwtest -D__IOS__ -I. dwtest.c ios/dw.m -framework UIKit -framework WebKit -framework Foundation -framework UserNotifications
 */
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 [view setFrame:frame];
 [view windowResized:frame.size];
 }
 @end
+#define _DW_BUTTON_TYPE_NORMAL 0
+#define _DW_BUTTON_TYPE_CHECK  1
+#define _DW_BUTTON_TYPE_RADIO  2
 /* Subclass for a button type */
 @interface DWButton : UIButton
 {
 void *userdata;
-UIButtonType buttonType;
 DWBox *parent;
+int type, state;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)buttonClicked:(id)sender;
--(UIButtonType)buttonType;
 -(void)setParent:(DWBox *)input;
 -(DWBox *)parent;
+-(int)type;
+-(void)setType:(int)input;
+-(int)state;
+-(void)setState:(int)input;
 @end
 @implementation DWButton
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)buttonClicked:(id)sender
 {
+/* Toggle the button */
+if(type == _DW_BUTTON_TYPE_CHECK)
+[self setState:(state ? FALSE : TRUE)];
+else if(type == _DW_BUTTON_TYPE_RADIO)
+[self setState:TRUE];
 _dw_event_handler(self, nil, 8);
-}
--(UIButtonType)buttonType { return buttonType; }
+/* If it is a radio button, uncheck all the other radio buttons in the box */
+if(type == _DW_BUTTON_TYPE_RADIO)
+{
+DWBox *viewbox = [self parent];
+Box *thisbox = [viewbox box];
+int z;
+for(z=0;z<thisbox->count;z++)
+{
+if(thisbox->items[z].type != TYPEBOX)
+{
+id object = thisbox->items[z].hwnd;
+if([object isMemberOfClass:[DWButton class]])
+{
+DWButton *button = object;
+if(button != self && [button type] == _DW_BUTTON_TYPE_RADIO)
+{
+[button setState:FALSE];
+}
+}
+}
+}
+}
+}
 -(void)setParent:(DWBox *)input { parent = input; }
 -(DWBox *)parent { return parent; }
+-(int)type { return type; }
+-(void)setType:(int)input { type = input; [self updateImage]; }
+-(void)updateImage
+{
+UIImage *image = nil;
+switch(type)
+{
+case _DW_BUTTON_TYPE_CHECK:
+{
+if(state)
+image = [UIImage systemImageNamed:@"checkbox.square"];
+else
+image = [UIImage systemImageNamed:@"square"];
+}
+break;
+case _DW_BUTTON_TYPE_RADIO:
+{
+if(state)
+image = [UIImage systemImageNamed:@"largecircle.fill.circle"];
+else
+image = [UIImage systemImageNamed:@"circle"];
+}
+break;
+}
+if(image)
+{
+CGSize size = [image size];
+[self setImage:image forState:UIControlStateNormal];
+[self setTitleEdgeInsets:UIEdgeInsetsMake(0,size.width,0,0)];
+}
+}
+-(int)state { return state; }
+-(void)setState:(int)input { state = input; [self updateImage]; }
 -(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a progress type */
 @interface DWPercent : UIProgressView
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
 NSString *nsstr = nil;
 id object = _dw_text_handle(handle);
 /* Handle all the different button types */
-if([ object isKindOfClass:[ UIButton class ] ])
+if([ object isMemberOfClass:[ DWButton class ] ])
 {
-switch([object buttonType])
+UIImage *image = (UIImage *)[object image];
-{
-default:
+if(image)
 {
-UIImage *image = (UIImage *)[object image];
+/* Image button */
+CGSize size = [image size];
-if(image)
+extrawidth = (int)size.width;
-{
+extraheight = (int)size.height;
-/* Image button */
+}
-CGSize size = [image size];
+/* Text button */
-thiswidth = (int)size.width;
+nsstr = [[object titleLabel] text];
-thisheight = (int)size.height;
-}
+if(nsstr && [nsstr length] > 0)
-else
+{
-{
+extrawidth += 8;
-/* Text button */
+extraheight += 4;
-nsstr = [[object titleLabel] text];
-extrawidth = 8;
-extraheight = 4;
-}
-break;
-}
 }
 }
 /* If the control is an entryfield set width to 150 */
 else if([object isKindOfClass:[ UITextField class ]])
 {
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_radiobutton_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
 DWButton *button = _dw_internal_button_new(text, cid);
-/* TODO: Customize to be a radio button https://github.com/DavydLiu/DLRadioButton */
+[button setType:_DW_BUTTON_TYPE_RADIO];
 DW_FUNCTION_RETURN_THIS(button);
 }
 /*
 * Create a new slider window (widget) to be packed.
 DW_FUNCTION_ADD_PARAM2(text, cid)
 DW_FUNCTION_RETURN(dw_checkbox_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
 {
 DWButton *button = _dw_internal_button_new(text, cid);
-/* TODO: Switch to UISwitch control with text */
+[button setType:_DW_BUTTON_TYPE_CHECK];
 DW_FUNCTION_RETURN_THIS(button);
 }
 /*
 * Returns the state of the checkbox.
 * Parameters:
 *          handle: Handle to the checkbox to be queried.
 */
-int API dw_checkbox_get(HWND handle)
+DW_FUNCTION_DEFINITION(dw_checkbox_get, int, HWND handle)
+DW_FUNCTION_ADD_PARAM1(handle)
+DW_FUNCTION_RETURN(dw_checkbox_get, int)
+DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
 {
 DWButton *button = handle;
+int retval = FALSE;
 if([button state])
-{
+retval = TRUE;
-return TRUE;
+DW_FUNCTION_RETURN_THIS(retval);
-}
-return FALSE;
 }
 /*
 * Sets the state of the checkbox.
 * Parameters:
 *          handle: Handle to the checkbox to be queried.
 *          value: TRUE for checked, FALSE for unchecked.
 */
-void API dw_checkbox_set(HWND handle, int value)
+DW_FUNCTION_DEFINITION(dw_checkbox_set, void, HWND handle, int value)
-{
+DW_FUNCTION_ADD_PARAM2(handle, value)
-#if 0 /* TODO: Convert to UISwitch */
+DW_FUNCTION_NO_RETURN(dw_checkbox_set)
+DW_FUNCTION_RESTORE_PARAM2(handle, HWND, value, int)
+{
 DWButton *button = handle;
-if(value)
+[button setState:value];
-{
+DW_FUNCTION_RETURN_NOTHING;
-[button setState:DWControlStateValueOn];
-}
-else
-{
-[button setState:DWControlStateValueOff];
-}
-#endif
 }
 /* Internal common function to create containers and listboxes */
 HWND _dw_cont_new(ULONG cid, int multi)
 {

Mercurial > dwindows

comparison ios/dw.m @ 2422:4a353a83b2e4