Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: scale timeline cache-height by DPI/pixelsize

Browse Source 
D602 by @blakenator with edits
This commit is contained in:
Campbell Barton
2015-02-10 22:33:52 +11:00
parent 27f81bf6ce
commit 1cfe0c1fb2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_time/space_time.c
View File

@@ -58,6 +58,7 @@
#include "UI_resources.h" #include "UI_resources.h"
#include "UI_view2d.h" #include "UI_view2d.h"
#include "UI_interface.h"
#include "ED_space_api.h" #include "ED_space_api.h"
#include "ED_markers.h" #include "ED_markers.h"
@@ -90,13 +91,12 @@ static void time_draw_sfra_efra(Scene *scene, View2D *v2d)
fdrawline((float)PEFRA, v2d->cur.ymin, (float)PEFRA, v2d->cur.ymax); fdrawline((float)PEFRA, v2d->cur.ymin, (float)PEFRA, v2d->cur.ymax);
} }
#define CACHE_DRAW_HEIGHT 3.0f
static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene) static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
{ {
PTCacheID *pid; PTCacheID *pid;
ListBase pidlist; ListBase pidlist;
SpaceTimeCache *stc = stime->caches.first; SpaceTimeCache *stc = stime->caches.first;
const float cache_draw_height = (4.0f * UI_DPI_FAC * U.pixelsize);
float yoffs = 0.f; float yoffs = 0.f;
if (!(stime->cache_display & TIME_CACHE_DISPLAY) || (!ob)) if (!(stime->cache_display & TIME_CACHE_DISPLAY) || (!ob))
@@ -172,7 +172,7 @@ static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
glPushMatrix(); glPushMatrix();
glTranslatef(0.0, (float)V2D_SCROLL_HEIGHT + yoffs, 0.0); glTranslatef(0.0, (float)V2D_SCROLL_HEIGHT + yoffs, 0.0);
glScalef(1.0, CACHE_DRAW_HEIGHT, 0.0); glScalef(1.0, cache_draw_height, 0.0);
switch (pid->type) { switch (pid->type) {
case PTCACHE_TYPE_SOFTBODY: case PTCACHE_TYPE_SOFTBODY:
@@ -230,7 +230,7 @@ static void time_draw_cache(SpaceTime *stime, Object *ob, Scene *scene)
glPopMatrix(); glPopMatrix();
yoffs += CACHE_DRAW_HEIGHT; yoffs += cache_draw_height;
stc = stc->next; stc = stc->next;
} }