Mercurial > dwindows

comparison win/dw.c @ 2146:d38c3aa33c3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: Don't set the menuinfo on the menubar when operating in popup (dark) mode.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 17 Jul 2020 02:55:38 +0000
parents 821f7d3a2e90
children dfc64135adb6
comparison
equal deleted inserted replaced
2145:821f7d3a2e90 2146:d38c3aa33c3f
6259 * location: Handle of a window frame to be attached to. 6259 * location: Handle of a window frame to be attached to.
6260 */ 6260 */
6261 HMENUI API dw_menubar_new(HWND location) 6261 HMENUI API dw_menubar_new(HWND location)
6262 { 6262 {
6263 HMENUI tmp; 6263 HMENUI tmp;
6264 MENUINFO mi;
6265 ColorInfo *cinfo = _dw_window_get_cinfo(location); 6264 ColorInfo *cinfo = _dw_window_get_cinfo(location);
6266 6265
6267 if(!cinfo) 6266 if(!cinfo)
6268 return NULL; 6267 return NULL;
6269 6268
6270 #ifdef DARK_MODE_TITLEBAR_MENU 6269 #ifdef DARK_MODE_TITLEBAR_MENU
6271 if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED) 6270 if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
6272 tmp = (HMENUI)CreatePopupMenu(); 6271 tmp = (HMENUI)CreatePopupMenu();
6273 else 6272 else
6274 #endif 6273 #endif
6275 tmp = (HMENUI)CreateMenu(); 6274 {
6276 6275 MENUINFO mi;
6277 mi.cbSize = sizeof(MENUINFO); 6276
6278 mi.fMask = MIM_MENUDATA; 6277 tmp = (HMENUI)CreateMenu();
6279 mi.dwMenuData = (ULONG_PTR)1; 6278
6280 6279 mi.cbSize = sizeof(MENUINFO);
6281 SetMenuInfo((HMENU)tmp, &mi); 6280 mi.fMask = MIM_MENUDATA;
6281 mi.dwMenuData = (ULONG_PTR)1;
6282
6283 SetMenuInfo((HMENU)tmp, &mi);
6284 }
6282 6285
6283 cinfo->hmenu = (HMENU)tmp; 6286 cinfo->hmenu = (HMENU)tmp;
6284 6287
6285 #ifdef DARK_MODE_TITLEBAR_MENU 6288 #ifdef DARK_MODE_TITLEBAR_MENU
6286 if(!(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)) 6289 if(!(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED))