diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-08-05 02:36:21 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-08-05 02:36:21 +0400 |
commit | 3367a030b3391c5dd0f61b615f64f8a0a8bde4f2 (patch) | |
tree | e4dce0c813fb5666ece8e083bd6269dbc3d3611c /source/blender/src/drawimasel.c | |
parent | 9102983b5135d6a5c3e76bf9eea5df98269040a9 (diff) |
- added UI_EMBOSSR option (rounded emboss)
- added support for vector icons, from user API side is just like using
a regular icon... on icon side is defined by a function in resources.c
instead of using the blenderbuttons png file. vector icons are much
easier to add and scale properly. intent is that vector icons would
be drawn in window coordinates which lets icon developers make the
most beautiful icons, but this requires some tweaking of the interface
drawing that I am not going to do atm.
- changed BIF_draw_icon* to take coordinates of where to draw icon instead
of using passed in raster position
- switch modifier UI to using vector icons, and tweaked some position and
style stuff.
- replaced most uses of UI_EMBOSSX with UI_EMBOSS (do same thing, just there
to confuse people I guess)
After the window coordinate stuff is sorted out with vector icons
it probably makes sense to move all non-photorealistic icons in blenderbuttons
to vector form just so scaling goes better.
Diffstat (limited to 'source/blender/src/drawimasel.c')
-rw-r--r-- | source/blender/src/drawimasel.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index e0116459eff..f8d358a9051 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -508,27 +508,24 @@ void draw_sima_area(SpaceImaSel *simasel) sx = simasel->desx; sy = simasel->deey+6; - glRasterPos2f(sx+16*0, sy); if (bitset(simasel->fase, IMS_FOUND_BIP)) { - BIF_draw_icon(ICON_BPIBFOLDER_HLT); + BIF_draw_icon(sx+16*0, sy, ICON_BPIBFOLDER_HLT); } else if (bitset(simasel->fase, IMS_WRITE_NO_BIP)) { - BIF_draw_icon(ICON_BPIBFOLDER_DEHLT); + BIF_draw_icon(sx+16*0, sy, ICON_BPIBFOLDER_DEHLT); } else { - BIF_draw_icon(ICON_BPIBFOLDER_DEHLT); + BIF_draw_icon(sx+16*0, sy, ICON_BPIBFOLDER_DEHLT); } - glRasterPos2f(sx+16*1, sy); if (bitset(simasel->fase, IMS_KNOW_INF)) { - BIF_draw_icon(ICON_FOLDER_HLT); + BIF_draw_icon(sx+16*1, sy, ICON_FOLDER_HLT); } else { - BIF_draw_icon(ICON_FOLDER_DEHLT); + BIF_draw_icon(sx+16*1, sy, ICON_FOLDER_DEHLT); } - glRasterPos2f(sx+16*2, sy); if (bitset(simasel->fase, IMS_KNOW_IMA)) { - BIF_draw_icon(ICON_BLUEIMAGE_HLT); + BIF_draw_icon(sx+16*2, sy, ICON_BLUEIMAGE_HLT); } else { - BIF_draw_icon(ICON_BLUEIMAGE_DEHLT); + BIF_draw_icon(sx+16*2, sy, ICON_BLUEIMAGE_DEHLT); } } |