icon: fixup asserting dialogs

dialog.h

@@ -434,6 +434,15 @@ union control {
  STANDARD_PREFIX;
  char shortcut;
  } fontselect;
+
+ // region tray-icon
+
+ struct {
+ STANDARD_PREFIX;
+ intorptr handle;
+ } icon;
+
+ // endregion
 };
 
 #undef STANDARD_PREFIX
@@ -605,8 +614,8 @@ union control *ctrl_tabdelay(struct controlset *, union control *);
 // region tray-icon
 
 union control *ctrl_icon(struct controlset *s,
- intorptr helpctx,
- intorptr context);
+  intorptr helpctx,
+  intorptr context);
 
 // endregion
 

windows/wincfg.c

@@ -13,6 +13,10 @@
 // region tray-icon
 
 int dlg_pick_icon(void *dlg, char **iname, int inamesize, DWORD *iindex);
+void dlg_icon_set(union control *ctrl, void *dlg, char const *icon);
+union control *ctrl_icon(struct controlset *s,
+ intorptr helpctx,
+ intorptr context);
 
 // endregion
 
@@ -489,7 +493,7 @@ void win_setup_config_box(struct controlbox *b,
  'n',
  I(TRAY_NORMAL),
  "Always",
- 'y',
+ NULL,
  I(TRAY_ALWAYS),
  "Never",
  'r',

windows/winctrls.c

@@ -26,6 +26,8 @@
 
 #include "pickicondialog.h"
 #include "win_res.h"
+#define ICONHEIGHT 20
+void staticicon(struct ctlpos *cp, char *stext, char *iname, int id);
 
 // endregion
 
@@ -1663,6 +1665,20 @@ void winctrl_layout(struct dlgparam *dp,
  }
  sfree(escaped);
  break;
+
+ // region tray-icon
+
+ case CTRL_ICON: {
+ Conf *conf = (Conf *)dp->data;
+ num_ids = 1;
+ staticicon(&pos,
+ ctrl->icon.label,
+ conf_get_filename(conf, ctrl->icon.context.i)->path,
+ base_id);
+ } break;
+
+ // endregion
+
  case CTRL_RADIO:
  num_ids = ctrl->radio.nbuttons + 1; /* label as well */
  {
@@ -2774,6 +2790,20 @@ HICON extract_icon(const char *iconpath, int smallicon)
  }
 }
 
+void staticicon(struct ctlpos *cp, char *stext, char *iname, int id)
+{
+ RECT r;
+ r.left = GAPBETWEEN;
+ r.top = cp->ypos;
+ r.right = cp->width;
+ r.bottom = ICONHEIGHT;
+ cp->ypos += r.bottom + GAPBETWEEN;
+ HWND hcontrol =
+ doctl(cp, r, "STATIC", WS_CHILD | WS_VISIBLE | SS_ICON, 0, NULL, id);
+ HICON hicon = extract_icon(iname, FALSE);
+ SendMessage(hcontrol, STM_SETICON, (WPARAM)hicon, 0);
+}
+
 void dlg_icon_set(union control *ctrl, void *dlg, char const *icon)
 {
  HICON hicon;