# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1620811181 0
# Node ID 1c17472a175ae79b17f4f3f02a5137e11564ae2a
# Parent  822f814a54f494cb5449f89be76cd9ed8bdfaa91
iOS: Implement scrollbars as sliders... implement vertical with a transform.
Also add a gray border on status text.

diff -r 822f814a54f4 -r 1c17472a175a ios/dw.m
--- a/ios/dw.m	Wed May 12 06:17:22 2021 +0000
+++ b/ios/dw.m	Wed May 12 09:19:41 2021 +0000
@@ -1965,13 +1965,26 @@
 @interface DWSlider : UISlider
 {
     void *userdata;
-}
+    BOOL vertical;
+}
+-(void)setVertical:(BOOL)vert;
+-(BOOL)vertical;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)sliderChanged:(id)sender;
 @end
 
 @implementation DWSlider
+-(void)setVertical:(BOOL)vert
+{
+    if(vert)
+    {
+        CGAffineTransform trans = CGAffineTransformMakeRotation(M_PI * 0.5);
+        self.transform = trans;
+    }
+    vertical = vert;
+}
+-(BOOL)vertical { return vertical; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)sliderChanged:(id)sender { int intVal = (int)[self value]; _dw_event_handler(self, DW_INT_TO_POINTER(intVal), 14); }
@@ -4346,10 +4359,10 @@
  *       increments: Number of increments available.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-DW_FUNCTION_DEFINITION(dw_slider_new, HWND, int DW_UNUSED(vertical), int increments, ULONG cid)
+DW_FUNCTION_DEFINITION(dw_slider_new, HWND, int vertical, int increments, ULONG cid)
 DW_FUNCTION_ADD_PARAM3(vertical, increments, cid)
 DW_FUNCTION_RETURN(dw_slider_new, HWND)
-DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(vertical), int, increments, int, cid, ULONG)
+DW_FUNCTION_RESTORE_PARAM3(vertical, int, increments, int, cid, ULONG)
 {
     DWSlider *slider = [[[DWSlider alloc] init] retain];
     [slider setMaximumValue:(double)increments];
@@ -4359,6 +4372,7 @@
                action:@selector(sliderChanged:)
      forControlEvents:UIControlEventValueChanged];
     [slider setTag:cid];
+    [slider setVertical:(vertical ? YES : NO)];
     DW_FUNCTION_RETURN_THIS(slider);
 }
 
@@ -4395,8 +4409,7 @@
  */
 HWND API dw_scrollbar_new(int vertical, ULONG cid)
 {
-    /*TODO: Implement scrollbars if possible */
-    return 0;
+    return dw_slider_new(vertical, 1, cid);
 }
 
 /*
@@ -4406,8 +4419,7 @@
  */
 unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
-    /*TODO: Implement scrollbars if possible */
-    return 0;
+    return dw_slider_get_pos(handle);
 }
 
 /*
@@ -4418,7 +4430,7 @@
  */
 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
 {
-    /*TODO: Implement scrollbars if possible */
+    dw_slider_set_pos(handle, position);
 }
 
 /*
@@ -4430,7 +4442,8 @@
  */
 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
 {
-    /*TODO: Implement scrollbars if possible */
+    DWSlider *slider = handle;
+    [slider setMaximumValue:(double)range];
 }
 
 /*
@@ -5278,9 +5291,21 @@
  *       text: The text to be display by the static text widget.
  *       id: An ID to be used with dw_window_from_id() or 0L.
  */
-HWND API dw_status_text_new(const char *text, ULONG cid)
-{
-    return dw_text_new(text, cid);
+DW_FUNCTION_DEFINITION(dw_status_text_new, HWND, const char *text, ULONG cid)
+DW_FUNCTION_ADD_PARAM2(text, cid)
+DW_FUNCTION_RETURN(dw_status_text_new, HWND)
+DW_FUNCTION_RESTORE_PARAM2(text, const char *, cid, ULONG)
+{
+    DWText *textfield = [[[DWText alloc] init] retain];
+    [textfield setText:[NSString stringWithUTF8String:text]];
+    [textfield setTag:cid];
+    if(DWDefaultFont)
+    {
+        [textfield setFont:DWDefaultFont];
+    }
+    [textfield layer].borderWidth = 2.0;
+    [textfield layer].borderColor = [[UIColor darkGrayColor] CGColor];
+    DW_FUNCTION_RETURN_THIS(textfield);
 }
 
 /*