[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59462] trunk/blender/source/blender/ editors/space_file/space_file.c: == filebrowser ==

[Andrea Weikert]

Revision: 59462
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59462
Author:   elubie
Date:     2013-08-24 12:53:47 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
== filebrowser ==

* fix old bug: wrong layout that could happen  when switching between thumbnail view and list view. This caused the layout to be recalculated sometimes and the items being moved. Reason was that the layout was wrongly initialized without the scroll bars, so calculated wrongly.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/space_file.c

Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c	2013-08-24 11:46:08 UTC (rev 59461)
+++ trunk/blender/source/blender/editors/space_file/space_file.c	2013-08-24 12:53:47 UTC (rev 59462)
@@ -148,7 +148,6 @@
 static void file_init(wmWindowManager *UNUSED(wm), ScrArea *sa)
 {
 	SpaceFile *sfile = (SpaceFile *)sa->spacedata.first;
-	//printf("file_init\n");
 
 	/* refresh system directory list */
 	fsmenu_refresh_system_category(fsmenu_get());
@@ -313,7 +312,6 @@
 	/* draw entirely, view changes should be handled here */
 	SpaceFile *sfile = CTX_wm_space_file(C);
 	FileSelectParams *params = ED_fileselect_get_params(sfile);
-	FileLayout *layout = NULL;
 
 	View2D *v2d = &ar->v2d;
 	View2DScrollers *scrollers;
@@ -323,15 +321,14 @@
 	if (!sfile->files || filelist_empty(sfile->files))
 		file_refresh(C, NULL);
 
-	layout = ED_fileselect_get_layout(sfile, ar);
-
 	/* clear and setup matrix */
 	UI_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 	
 	/* Allow dynamically sliders to be set, saves notifiers etc. */
-	if (layout && (layout->flag == FILE_LAYOUT_VER)) {
+	
+	if (params && (params->display == FILE_IMGDISPLAY)) {
 		v2d->scroll = V2D_SCROLL_RIGHT;
 		v2d->keepofs &= ~V2D_LOCKOFS_Y;
 		v2d->keepofs |= V2D_LOCKOFS_X;