Mercurial > dwindows

changeset 2723:27fd270cb0db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
iOS: Implement initial color in the color picker dialog. Also fix a main thread warning in dw_scrollbar_new().
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 09 Dec 2021 12:40:17 +0000
parents cacde852e2db
children c1f8e598960d
files ios/dw.m
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ios/dw.m	Thu Dec 09 11:52:59 2021 +0000
+++ b/ios/dw.m	Thu Dec 09 12:40:17 2021 +0000
@@ -1064,6 +1064,7 @@
         DWDialog *dialog = dw_dialog_new(NULL);
         UIColorPickerViewController *picker = [[UIColorPickerViewController alloc] init];
         DWColorPickerDelegate *delegate = [[DWColorPickerDelegate alloc] init];
+        unsigned long color = [[params firstObject] unsignedLongValue];
 
         /* Setup our picker */
         [picker setSupportsAlpha:NO];
@@ -1072,6 +1073,7 @@
         [hiddenWindow makeKeyAndVisible];
         [delegate setDialog:dialog];
         [picker setDelegate:delegate];
+        [picker setSelectedColor:[UIColor colorWithRed: DW_RED_VALUE(color)/255.0 green: DW_GREEN_VALUE(color)/255.0 blue: DW_BLUE_VALUE(color)/255.0 alpha: 1]];
         /* Wait for them to pick a color */
         [[hiddenWindow rootViewController] presentViewController:picker animated:YES completion:nil];
         [params addObject:[NSNumber numberWithUnsignedLong:DW_POINTER_TO_UINT(dw_dialog_wait(dialog))]];
@@ -4561,12 +4563,15 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND API dw_scrollbar_new(int vertical, ULONG cid)
+DW_FUNCTION_DEFINITION(dw_scrollbar_new, HWND, int vertical, ULONG cid)
+DW_FUNCTION_ADD_PARAM2(vertical, cid)
+DW_FUNCTION_RETURN(dw_scrollbar_new, HWND)
+DW_FUNCTION_RESTORE_PARAM2(vertical, int, cid, ULONG)
 {
     DWSlider *slider = dw_slider_new(vertical, 1, cid);
     [slider setMinimumTrackTintColor:[UIColor clearColor]];
     [slider setMaximumTrackTintColor:[UIColor clearColor]];
-    return slider;
+    DW_FUNCTION_RETURN_THIS(slider);
 }
 
 /*
@@ -5599,7 +5604,7 @@
  */
 unsigned long API dw_color_choose(unsigned long value)
 {
-    NSMutableArray *params = [NSMutableArray arrayWithObject:[NSNumber numberWithUnsignedLong:value]];
+    NSMutableArray *params = [NSMutableArray arrayWithObject:[NSNumber numberWithUnsignedLong:_dw_get_color(value)]];
     unsigned long newcolor = value;
 
     [DWObj safeCall:@selector(colorPicker:) withObject:params];