From: skeezix <skeezix@flotsam-vm.(none)>
Date: Mon, 31 Jan 2011 22:32:01 +0000 (-0500)
Subject: Suppress child cats now doesn't make folders in parent cat, for cat-as-folder option... 
X-Git-Tag: sz_beta3~96
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd7fad722804f13d454cddda96947f499bde866;p=pandora-libraries.git

Suppress child cats now doesn't make folders in parent cat, for cat-as-folder option; render fix for 'X going up' button
---

diff --git a/minimenu/mmcat.c b/minimenu/mmcat.c
index ba030a4..3640b62 100644
--- a/minimenu/mmcat.c
+++ b/minimenu/mmcat.c
@@ -523,7 +523,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
 
   // if subcats as folders, then lets just make up a dummy app that pretends to be a folder,
   // and stuff it into the parent cat
-  if ( parentcatname && pnd_conf_get_as_int_d ( g_conf, "tabs.subcat_as_folders", 1 ) ) {
+  if ( parentcatname && pnd_conf_get_as_int_d ( g_conf, "tabs.subcat_as_folders", 1 ) && cat_is_visible ( g_conf, catname ) ) {
 
     // it is implicit that since we're talking parentcat, its already been created in a previous call
     // therefore, we need to..
@@ -549,7 +549,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
       disco = pnd_box_allocinsert ( pcat -> disco, catname, sizeof(pnd_disco_t) );
       if ( disco ) {
 
-	// create the subcat faux-disco entry, and register into parent cat
+	// create the subcat faux-disco entry, and register into parent cat .. if its visible
 	char uid [ 30 ];
 	sprintf ( uid, "%p", catname );
 
diff --git a/minimenu/mmui.c b/minimenu/mmui.c
index f04a31b..4d8cce2 100644
--- a/minimenu/mmui.c
+++ b/minimenu/mmui.c
@@ -1288,6 +1288,7 @@ void ui_process_input ( pnd_dbusnotify_handle dbh, pnd_notify_handle nh ) {
 	}
 	// redraw the grid
 	render_mask |= CHANGED_EVERYTHING;
+	ui_event++;
 
       } else if ( event.key.keysym.sym == SDLK_LALT ) { // start button
 	ui_push_exec();