[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29358] trunk/blender/source/blender/ editors/interface/interface_panel.c: Fix [#22188] Minor UI bug with panels in the properties window.

[Matt Ebb]

Revision: 29358
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29358
Author:   broken
Date:     2010-06-09 09:55:49 +0200 (Wed, 09 Jun 2010)

Log Message:
-----------
Fix [#22188] Minor UI bug with panels in the properties window.

This prevents header-less panels (such as object name in object properties) from being re-sorted
when dragging other panels.

Also minor tweak, make the 'a' key shortcut to open and close panels only work with there are no 
other modifier keys (like alt).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_panel.c

Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c	2010-06-09 06:21:07 UTC (rev 29357)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c	2010-06-09 07:55:49 UTC (rev 29358)
@@ -656,6 +656,10 @@
 {
 	const PanelSort *ps1=a1, *ps2=a2;
 	
+	/* stick uppermost header-less panels to the top of the region -
+	 * prevent them from being sorted */
+	if (ps1->pa->sortorder < ps2->pa->sortorder && ps1->pa->type->flag & PNL_NO_HEADER) return -1;
+	
 	if(ps1->pa->ofsy+ps1->pa->sizey < ps2->pa->ofsy+ps2->pa->sizey) return 1;
 	else if(ps1->pa->ofsy+ps1->pa->sizey > ps2->pa->ofsy+ps2->pa->sizey) return -1;
 	else if(ps1->pa->sortorder > ps2->pa->sortorder) return 1;
@@ -1055,7 +1059,7 @@
 				inside= 1;
 		
 		if(inside && event->val==KM_PRESS) {
-			if(event->type == AKEY) {
+			if(event->type == AKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift)) {
 				
 				if(pa->flag & PNL_CLOSEDY) {
 					if((block->maxy <= my) && (block->maxy+PNL_HEADER >= my))