archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

file selector now scales with DPI better

Browse Source
This commit is contained in:
Campbell Barton
2011-06-05 14:00:06 +00:00
parent 56befd2666
commit 08f44adba9
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/include/UI_interface_icons.h
View File

@@ -49,6 +49,10 @@ typedef struct IconFile {
#define ICON_DEFAULT_HEIGHT 16 #define ICON_DEFAULT_HEIGHT 16
#define ICON_DEFAULT_WIDTH 16 #define ICON_DEFAULT_WIDTH 16
#define ICON_DEFAULT_HEIGHT_SCALE (UI_UNIT_Y * 0.8f)
#define ICON_DEFAULT_WIDTH_SCALE (UI_UNIT_X * 0.8f)
#define PREVIEW_DEFAULT_HEIGHT 96 #define PREVIEW_DEFAULT_HEIGHT 96
/* /*

4
source/blender/editors/space_file/file_draw.c
View File

@@ -517,8 +517,8 @@ void file_draw_list(const bContext *C, ARegion *ar)
file_draw_preview(block, file, sx, sy, imb, layout, !is_icon && (file->flags & IMAGEFILE)); file_draw_preview(block, file, sx, sy, imb, layout, !is_icon && (file->flags & IMAGEFILE));
} else { } else {
file_draw_icon(block, file->path, sx, sy-3, get_file_icon(file), ICON_DEFAULT_WIDTH, ICON_DEFAULT_WIDTH); file_draw_icon(block, file->path, sx, sy-(UI_UNIT_Y / 6), get_file_icon(file), ICON_DEFAULT_WIDTH_SCALE, ICON_DEFAULT_WIDTH_SCALE);
sx += ICON_DEFAULT_WIDTH + 4; sx += ICON_DEFAULT_WIDTH_SCALE + 4;
} }
UI_ThemeColor4(TH_TEXT); UI_ThemeColor4(TH_TEXT);

8
source/blender/editors/space_file/filesel.c
View File

@@ -403,10 +403,12 @@ float file_font_pointsize(void)
uiStyleFontSet(&style->widget); uiStyleFontSet(&style->widget);
s = BLF_height(style->widget.uifont_id, tmp); s = BLF_height(style->widget.uifont_id, tmp);
return style->widget.points; return style->widget.points;
#else #elif 0
uiStyle *style= U.uistyles.first; uiStyle *style= U.uistyles.first;
uiStyleFontSet(&style->widget); uiStyleFontSet(&style->widget);
return style->widget.points; return style->widget.points;
#else
return UI_UNIT_Y * 0.6666f;
#endif #endif
} }
@@ -497,11 +499,11 @@ void ED_fileselect_init_layout(struct SpaceFile *sfile, struct ARegion *ar)
column_widths(sfile->files, layout); column_widths(sfile->files, layout);
if (params->display == FILE_SHORTDISPLAY) { if (params->display == FILE_SHORTDISPLAY) {
maxlen = ICON_DEFAULT_WIDTH + 4 + maxlen = ICON_DEFAULT_WIDTH_SCALE + 4 +
(int)layout->column_widths[COLUMN_NAME] + 12 + (int)layout->column_widths[COLUMN_NAME] + 12 +
(int)layout->column_widths[COLUMN_SIZE] + 12; (int)layout->column_widths[COLUMN_SIZE] + 12;
} else { } else {
maxlen = ICON_DEFAULT_WIDTH + 4 + maxlen = ICON_DEFAULT_WIDTH_SCALE + 4 +
(int)layout->column_widths[COLUMN_NAME] + 12 + (int)layout->column_widths[COLUMN_NAME] + 12 +
#ifndef WIN32 #ifndef WIN32
(int)layout->column_widths[COLUMN_MODE1] + 12 + (int)layout->column_widths[COLUMN_MODE1] + 12 +