Tweak the new button style to add slight drop shadows, add folder icons.

Set the new style as default now that it works on white backgrounds too.
This commit is contained in:
Henrik Rydgard 2013-12-11 09:35:27 +01:00
parent 20d4c34ff5
commit 3baddab8a9
30 changed files with 5254 additions and 4372 deletions

View File

@ -259,7 +259,7 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) {
#endif
control->Get("DisableDpadDiagonals", &bDisableDpadDiagonals, false);
control->Get("TouchButtonStyle", &iTouchButtonStyle, 0);
control->Get("TouchButtonStyle", &iTouchButtonStyle, 1);
control->Get("TouchButtonOpacity", &iTouchButtonOpacity, 65);
//set these to -1 if not initialized. initializing these
//requires pixel coordinates which is not known right now.

View File

@ -207,7 +207,6 @@ inline float tiltInputCurve(float x) {
} else {
return 0.0f;
}
}
inline float clamp1(float x) {

View File

@ -377,7 +377,7 @@ void GameBrowser::Refresh() {
if (fileInfo[i].isDirectory && (path_.GetPath().size() < 4 || !File::Exists(path_.GetPath() + fileInfo[i].name + "/EBOOT.PBP"))) {
// Check if eboot directory
if (allowBrowsing_)
dirButtons.push_back(new UI::Button(fileInfo[i].name.c_str(), new UI::LinearLayoutParams(UI::FILL_PARENT, UI::FILL_PARENT)));
dirButtons.push_back(new UI::Button(fileInfo[i].name.c_str(), I_FOLDER, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::FILL_PARENT)));
} else {
gameButtons.push_back(new GameButton(fileInfo[i].fullName, *gridStyle_, new UI::LinearLayoutParams(*gridStyle_ == true ? UI::WRAP_CONTENT : UI::FILL_PARENT, UI::WRAP_CONTENT)));
}
@ -397,7 +397,7 @@ void GameBrowser::Refresh() {
}
if (allowBrowsing_) {
gameList_->Add(new UI::Button("..", new UI::LinearLayoutParams(UI::FILL_PARENT, UI::FILL_PARENT)))->
gameList_->Add(new UI::Button(I_UP_DIRECTORY, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::FILL_PARENT)))->
OnClick.Handle(this, &GameBrowser::NavigateClick);
}

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,9 @@
#define I_LOGO 28
#define I_ICON 29
#define I_ICONGOLD 30
#define I_FOLDER 31
#define I_UP_DIRECTORY 32
extern const Atlas ui_atlas;
extern const AtlasImage ui_images[31];
extern const AtlasImage ui_images[33];

View File

@ -3,105 +3,105 @@
#include "ui_atlas.h"
const AtlasChar font_UBUNTU24_chardata[] = {
// RANGE: 0x20 - 0x80, start 0x1f
// RANGE: 0x20 - 0x80, start 0x21
{0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.5000f, 1, 1}, // 0020
{0.525391f, 0.615234f, 0.541016f, 0.671875f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021
{0.218750f, 0.333984f, 0.242188f, 0.359375f, 0.1875f, -28.1875f, 11.6875f, 12, 13}, // 0022
{0.052734f, 0.492188f, 0.091797f, 0.548828f, -1.0625f, -28.1875f, 18.0000f, 20, 29}, // 0023
{0.830078f, 0.296875f, 0.865234f, 0.367188f, -0.2500f, -32.0000f, 17.3125f, 18, 36}, // 0024
{0.642578f, 0.460938f, 0.689453f, 0.517578f, -0.3750f, -28.5000f, 22.6875f, 24, 29}, // 0025
{0.691406f, 0.482422f, 0.734375f, 0.539063f, -0.8750f, -28.5000f, 19.7500f, 22, 29}, // 0026
{0.914063f, 0.488281f, 0.929688f, 0.513672f, -0.1875f, -28.1875f, 6.8125f, 8, 13}, // 0027
{0.857422f, 0.591797f, 0.880859f, 0.667969f, -0.0625f, -31.0000f, 10.0625f, 12, 39}, // 0028
{0.882813f, 0.591797f, 0.906250f, 0.667969f, -1.6250f, -31.0000f, 10.1250f, 12, 39}, // 0029
{0.494141f, 0.615234f, 0.523438f, 0.646484f, -0.8750f, -21.9375f, 13.1875f, 15, 16}, // 002a
{0.714844f, 0.599609f, 0.751953f, 0.642578f, -0.8750f, -24.0625f, 17.2500f, 19, 22}, // 002b
{0.857422f, 0.455078f, 0.875000f, 0.480469f, -1.0625f, -7.5625f, 6.8750f, 9, 13}, // 002c
{0.720703f, 0.371094f, 0.746094f, 0.384766f, 0.2500f, -15.5625f, 13.0625f, 13, 7}, // 002d
{0.853516f, 0.369141f, 0.869141f, 0.384766f, 0.3125f, -7.3750f, 8.3125f, 8, 8}, // 002e
{0.324219f, 0.548828f, 0.355469f, 0.609375f, -1.8750f, -28.2500f, 12.1250f, 16, 31}, // 002f
{0.662109f, 0.541016f, 0.699219f, 0.597656f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0030
{0.248047f, 0.609375f, 0.273438f, 0.666016f, 1.0625f, -28.5625f, 17.5625f, 13, 29}, // 0031
{0.701172f, 0.541016f, 0.738281f, 0.597656f, -0.2500f, -28.5000f, 17.5000f, 19, 29}, // 0032
{0.740234f, 0.541016f, 0.777344f, 0.597656f, -0.3750f, -28.5000f, 17.5000f, 19, 29}, // 0033
{0.093750f, 0.494141f, 0.132813f, 0.550781f, -0.8750f, -28.1875f, 17.5625f, 20, 29}, // 0034
{0.074219f, 0.552734f, 0.109375f, 0.609375f, 0.1250f, -28.1875f, 17.5000f, 18, 29}, // 0035
{0.779297f, 0.541016f, 0.816406f, 0.597656f, -0.0625f, -28.5000f, 17.5625f, 19, 29}, // 0036
{0.818359f, 0.541016f, 0.855469f, 0.597656f, -0.6250f, -28.1875f, 17.5625f, 19, 29}, // 0037
{0.355469f, 0.544922f, 0.392578f, 0.601563f, -0.5000f, -28.5000f, 17.5625f, 19, 29}, // 0038
{0.394531f, 0.544922f, 0.431641f, 0.601563f, -0.5625f, -28.5000f, 17.5000f, 19, 29}, // 0039
{0.982422f, 0.232422f, 0.998047f, 0.275391f, 0.3125f, -21.9375f, 7.9375f, 8, 22}, // 003a
{0.433594f, 0.361328f, 0.451172f, 0.414063f, -0.1875f, -21.9375f, 7.8750f, 9, 27}, // 003b
{0.099609f, 0.611328f, 0.130859f, 0.650391f, -1.0000f, -20.6875f, 15.1250f, 16, 20}, // 003c
{0.142578f, 0.333984f, 0.175781f, 0.361328f, 0.1875f, -20.1250f, 16.9375f, 17, 14}, // 003d
{0.064453f, 0.611328f, 0.097656f, 0.650391f, -0.1250f, -20.5000f, 15.3750f, 17, 20}, // 003e
{0.583984f, 0.578125f, 0.617188f, 0.634766f, -1.2500f, -28.5625f, 14.3750f, 17, 29}, // 003f
{0.525391f, 0.425781f, 0.582031f, 0.496094f, -0.5000f, -27.6250f, 27.5625f, 29, 36}, // 0040
{0.736328f, 0.482422f, 0.779297f, 0.539063f, -1.5000f, -28.2500f, 18.6875f, 22, 29}, // 0041
{0.134766f, 0.494141f, 0.173828f, 0.550781f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0042
{0.500000f, 0.498047f, 0.539063f, 0.554688f, -0.3125f, -28.5000f, 18.8125f, 20, 29}, // 0043
{0.541016f, 0.498047f, 0.580078f, 0.554688f, 0.3125f, -28.1875f, 19.8125f, 20, 29}, // 0044
{0.111328f, 0.552734f, 0.146484f, 0.609375f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0045
{0.472656f, 0.556641f, 0.507813f, 0.613281f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0046
{0.371094f, 0.486328f, 0.412109f, 0.542969f, -0.3125f, -28.5000f, 19.8750f, 21, 29}, // 0047
{0.414063f, 0.486328f, 0.455078f, 0.542969f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 0048
{0.542969f, 0.615234f, 0.558594f, 0.671875f, 0.6250f, -28.1875f, 8.6250f, 8, 29}, // 0049
{0.509766f, 0.556641f, 0.544922f, 0.613281f, -1.1250f, -28.1875f, 16.3125f, 18, 29}, // 004a
{0.457031f, 0.486328f, 0.498047f, 0.542969f, 0.3125f, -28.1875f, 18.8125f, 21, 29}, // 004b
{0.546875f, 0.556641f, 0.582031f, 0.613281f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 004c
{0.947266f, 0.455078f, 0.996094f, 0.511719f, 0.1875f, -28.1875f, 24.7500f, 25, 29}, // 004d
{0.871094f, 0.488281f, 0.912109f, 0.544922f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 004e
{0.226563f, 0.490234f, 0.267578f, 0.546875f, -0.3750f, -28.5625f, 20.1875f, 21, 29}, // 004f
{0.914063f, 0.513672f, 0.953125f, 0.570313f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0050
{0.947266f, 0.390625f, 0.992188f, 0.453125f, -0.3750f, -28.5625f, 20.6250f, 23, 32}, // 0051
{0.955078f, 0.513672f, 0.994141f, 0.570313f, 0.3125f, -28.1875f, 18.9375f, 20, 29}, // 0052
{0.582031f, 0.519531f, 0.621094f, 0.576172f, -0.5625f, -28.5000f, 18.1250f, 20, 29}, // 0053
{0.269531f, 0.490234f, 0.310547f, 0.546875f, -1.3750f, -28.1875f, 17.3125f, 21, 29}, // 0054
{0.312500f, 0.490234f, 0.353516f, 0.546875f, 0.0625f, -28.1875f, 20.1250f, 21, 29}, // 0055
{0.179688f, 0.482422f, 0.224609f, 0.539063f, -1.6875f, -28.1875f, 18.6875f, 23, 29}, // 0056
{0.583984f, 0.460938f, 0.640625f, 0.517578f, -1.5000f, -28.1875f, 25.8125f, 29, 29}, // 0057
{0.781250f, 0.482422f, 0.824219f, 0.539063f, -1.2500f, -28.1875f, 18.6875f, 22, 29}, // 0058
{0.826172f, 0.482422f, 0.869141f, 0.539063f, -1.5625f, -28.1875f, 18.6875f, 22, 29}, // 0059
{0.433594f, 0.544922f, 0.470703f, 0.601563f, -0.6875f, -28.1875f, 16.6875f, 19, 29}, // 005a
{0.976563f, 0.572266f, 0.996094f, 0.646484f, 0.1250f, -31.8125f, 8.4375f, 10, 38}, // 005b
{0.943359f, 0.572266f, 0.974609f, 0.632813f, -1.6250f, -28.2500f, 12.3750f, 16, 31}, // 005c
{0.830078f, 0.599609f, 0.849609f, 0.673828f, -1.8125f, -31.8125f, 8.3750f, 10, 38}, // 005d
{0.462891f, 0.615234f, 0.492188f, 0.648438f, -1.1250f, -28.2500f, 12.7500f, 15, 17}, // 005e
{0.597656f, 0.283203f, 0.630859f, 0.296875f, -1.8750f, -4.0625f, 13.3125f, 17, 7}, // 005f
{0.830078f, 0.369141f, 0.851563f, 0.386719f, -0.8750f, -29.2500f, 9.8750f, 11, 9}, // 0060
{0.792969f, 0.599609f, 0.828125f, 0.644531f, -0.7500f, -22.3125f, 16.0625f, 18, 23}, // 0061
{0.000000f, 0.539063f, 0.035156f, 0.599609f, -0.0625f, -29.8750f, 16.7500f, 18, 31}, // 0062
{0.357422f, 0.603516f, 0.390625f, 0.648438f, -0.7500f, -22.2500f, 15.4375f, 17, 23}, // 0063
{0.175781f, 0.541016f, 0.210938f, 0.601563f, -0.6875f, -29.8750f, 16.7500f, 18, 31}, // 0064
{0.000000f, 0.601563f, 0.035156f, 0.646484f, -0.7500f, -22.2500f, 15.5000f, 18, 23}, // 0065
{0.685547f, 0.599609f, 0.712891f, 0.660156f, -1.3125f, -30.2500f, 10.0625f, 14, 31}, // 0066
{0.212891f, 0.548828f, 0.248047f, 0.607422f, -0.6250f, -22.3125f, 16.7500f, 18, 30}, // 0067
{0.908203f, 0.572266f, 0.941406f, 0.630859f, -0.1250f, -29.9375f, 16.6875f, 17, 30}, // 0068
{0.982422f, 0.171875f, 0.998047f, 0.230469f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 0069
{0.976563f, 0.285156f, 0.998047f, 0.359375f, -3.1875f, -29.9375f, 7.8125f, 11, 38}, // 006a
{0.250000f, 0.548828f, 0.285156f, 0.607422f, -0.0625f, -29.9375f, 15.5000f, 18, 30}, // 006b
{0.132813f, 0.611328f, 0.148438f, 0.669922f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 006c
{0.000000f, 0.492188f, 0.050781f, 0.537109f, -0.0625f, -22.3125f, 25.6875f, 26, 23}, // 006d
{0.392578f, 0.603516f, 0.425781f, 0.648438f, -0.0625f, -22.3125f, 16.8125f, 17, 23}, // 006e
{0.646484f, 0.599609f, 0.683594f, 0.644531f, -0.7500f, -22.2500f, 16.7500f, 19, 23}, // 006f
{0.287109f, 0.548828f, 0.322266f, 0.607422f, -0.0625f, -22.3125f, 16.7500f, 18, 30}, // 0070
{0.037109f, 0.550781f, 0.072266f, 0.609375f, -0.6875f, -22.2500f, 16.7500f, 18, 30}, // 0071
{0.455078f, 0.236328f, 0.480469f, 0.281250f, -0.0625f, -22.3125f, 10.4375f, 13, 23}, // 0072
{0.427734f, 0.603516f, 0.460938f, 0.648438f, -0.8750f, -22.2500f, 15.0000f, 17, 23}, // 0073
{0.037109f, 0.611328f, 0.062500f, 0.664063f, -1.5000f, -26.4375f, 10.1875f, 13, 27}, // 0074
{0.212891f, 0.609375f, 0.246094f, 0.654297f, -0.1250f, -21.9375f, 16.7500f, 17, 23}, // 0075
{0.753906f, 0.599609f, 0.791016f, 0.642578f, -1.5000f, -22.0000f, 15.0000f, 19, 22}, // 0076
{0.857422f, 0.546875f, 0.906250f, 0.589844f, -1.3750f, -22.0000f, 22.0625f, 25, 22}, // 0077
{0.175781f, 0.603516f, 0.210938f, 0.646484f, -1.4375f, -22.0000f, 15.0000f, 18, 22}, // 0078
{0.623047f, 0.519531f, 0.660156f, 0.578125f, -1.6875f, -22.0000f, 15.0000f, 19, 30}, // 0079
{0.275391f, 0.609375f, 0.308594f, 0.652344f, -0.6875f, -22.0000f, 15.0000f, 17, 22}, // 007a
{0.148438f, 0.552734f, 0.173828f, 0.625000f, -1.1250f, -30.5625f, 10.0000f, 13, 37}, // 007b
{0.343750f, 0.611328f, 0.357422f, 0.675781f, 0.1875f, -28.1875f, 7.4375f, 7, 33}, // 007c
{0.619141f, 0.580078f, 0.644531f, 0.652344f, -1.5000f, -30.5625f, 10.0000f, 13, 37}, // 007d
{0.177734f, 0.333984f, 0.216797f, 0.355469f, -0.1875f, -17.3750f, 19.6250f, 20, 11}, // 007e
{0.888672f, 0.689453f, 0.904297f, 0.746094f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021
{0.751953f, 0.699219f, 0.775391f, 0.724609f, 0.1875f, -28.1875f, 11.6875f, 12, 13}, // 0022
{0.791016f, 0.582031f, 0.830078f, 0.638672f, -1.0625f, -28.1875f, 18.0000f, 20, 29}, // 0023
{0.212891f, 0.250000f, 0.248047f, 0.320313f, -0.2500f, -32.0000f, 17.3125f, 18, 36}, // 0024
{0.498047f, 0.560547f, 0.544922f, 0.617188f, -0.3750f, -28.5000f, 22.6875f, 24, 29}, // 0025
{0.546875f, 0.564453f, 0.589844f, 0.621094f, -0.8750f, -28.5000f, 19.7500f, 22, 29}, // 0026
{0.166016f, 0.701172f, 0.181641f, 0.726563f, -0.1875f, -28.1875f, 6.8125f, 8, 13}, // 0027
{0.607422f, 0.623047f, 0.630859f, 0.699219f, -0.0625f, -31.0000f, 10.0625f, 12, 39}, // 0028
{0.460938f, 0.660156f, 0.484375f, 0.736328f, -1.6250f, -31.0000f, 10.1250f, 12, 39}, // 0029
{0.341797f, 0.576172f, 0.371094f, 0.607422f, -0.8750f, -21.9375f, 13.1875f, 15, 16}, // 002a
{0.263672f, 0.494141f, 0.300781f, 0.537109f, -0.8750f, -24.0625f, 17.2500f, 19, 22}, // 002b
{0.146484f, 0.701172f, 0.164063f, 0.726563f, -1.0625f, -7.5625f, 6.8750f, 9, 13}, // 002c
{0.677734f, 0.619141f, 0.703125f, 0.632813f, 0.2500f, -15.5625f, 13.0625f, 13, 7}, // 002d
{0.605469f, 0.701172f, 0.621094f, 0.716797f, 0.3125f, -7.3750f, 8.3125f, 8, 8}, // 002e
{0.964844f, 0.230469f, 0.996094f, 0.291016f, -1.8750f, -28.2500f, 12.1250f, 16, 31}, // 002f
{0.000000f, 0.625000f, 0.037109f, 0.681641f, -0.3125f, -28.5000f, 17.5625f, 19, 29}, // 0030
{0.861328f, 0.689453f, 0.886719f, 0.746094f, 1.0625f, -28.5625f, 17.5625f, 13, 29}, // 0031
{0.039063f, 0.625000f, 0.076172f, 0.681641f, -0.2500f, -28.5000f, 17.5000f, 19, 29}, // 0032
{0.832031f, 0.630859f, 0.869141f, 0.687500f, -0.3750f, -28.5000f, 17.5000f, 19, 29}, // 0033
{0.447266f, 0.601563f, 0.486328f, 0.658203f, -0.8750f, -28.1875f, 17.5625f, 20, 29}, // 0034
{0.751953f, 0.640625f, 0.787109f, 0.697266f, 0.1250f, -28.1875f, 17.5000f, 18, 29}, // 0035
{0.871094f, 0.630859f, 0.908203f, 0.687500f, -0.0625f, -28.5000f, 17.5625f, 19, 29}, // 0036
{0.212891f, 0.634766f, 0.250000f, 0.691406f, -0.6250f, -28.1875f, 17.5625f, 19, 29}, // 0037
{0.251953f, 0.634766f, 0.289063f, 0.691406f, -0.5000f, -28.5000f, 17.5625f, 19, 29}, // 0038
{0.291016f, 0.634766f, 0.328125f, 0.691406f, -0.5625f, -28.5000f, 17.5000f, 19, 29}, // 0039
{0.128906f, 0.697266f, 0.144531f, 0.740234f, 0.3125f, -21.9375f, 7.9375f, 8, 22}, // 003a
{0.636719f, 0.564453f, 0.654297f, 0.617188f, -0.1875f, -21.9375f, 7.8750f, 9, 27}, // 003b
{0.742188f, 0.167969f, 0.773438f, 0.207031f, -1.0000f, -20.6875f, 15.1250f, 16, 20}, // 003c
{0.269531f, 0.693359f, 0.302734f, 0.720703f, 0.1875f, -20.1250f, 16.9375f, 17, 14}, // 003d
{0.707031f, 0.167969f, 0.740234f, 0.207031f, -0.1250f, -20.5000f, 15.3750f, 17, 20}, // 003e
{0.964844f, 0.355469f, 0.998047f, 0.412109f, -1.2500f, -28.5625f, 14.3750f, 17, 29}, // 003f
{0.865234f, 0.558594f, 0.921875f, 0.628906f, -0.5000f, -27.6250f, 27.5625f, 29, 36}, // 0040
{0.591797f, 0.564453f, 0.634766f, 0.621094f, -1.5000f, -28.2500f, 18.6875f, 22, 29}, // 0041
{0.341797f, 0.613281f, 0.380859f, 0.669922f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0042
{0.382813f, 0.613281f, 0.421875f, 0.669922f, -0.3125f, -28.5000f, 18.8125f, 20, 29}, // 0043
{0.923828f, 0.617188f, 0.962891f, 0.673828f, 0.3125f, -28.1875f, 19.8125f, 20, 29}, // 0044
{0.789063f, 0.640625f, 0.824219f, 0.697266f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0045
{0.423828f, 0.660156f, 0.458984f, 0.716797f, 0.3125f, -28.1875f, 16.4375f, 18, 29}, // 0046
{0.212891f, 0.576172f, 0.253906f, 0.632813f, -0.3125f, -28.5000f, 19.8750f, 21, 29}, // 0047
{0.255859f, 0.576172f, 0.296875f, 0.632813f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 0048
{0.304688f, 0.693359f, 0.320313f, 0.750000f, 0.6250f, -28.1875f, 8.6250f, 8, 29}, // 0049
{0.330078f, 0.671875f, 0.365234f, 0.728516f, -1.1250f, -28.1875f, 16.3125f, 18, 29}, // 004a
{0.298828f, 0.576172f, 0.339844f, 0.632813f, 0.3125f, -28.1875f, 18.8125f, 21, 29}, // 004b
{0.367188f, 0.671875f, 0.402344f, 0.728516f, 0.3125f, -28.1875f, 16.3750f, 18, 29}, // 004c
{0.447266f, 0.542969f, 0.496094f, 0.599609f, 0.1875f, -28.1875f, 24.7500f, 25, 29}, // 004d
{0.089844f, 0.578125f, 0.130859f, 0.634766f, 0.3125f, -28.1875f, 20.8125f, 21, 29}, // 004e
{0.132813f, 0.578125f, 0.173828f, 0.634766f, -0.3750f, -28.5625f, 20.1875f, 21, 29}, // 004f
{0.488281f, 0.619141f, 0.527344f, 0.675781f, 0.3125f, -28.1875f, 18.7500f, 20, 29}, // 0050
{0.953125f, 0.105469f, 0.998047f, 0.167969f, -0.3750f, -28.5625f, 20.6250f, 23, 32}, // 0051
{0.636719f, 0.619141f, 0.675781f, 0.675781f, 0.3125f, -28.1875f, 18.9375f, 20, 29}, // 0052
{0.529297f, 0.623047f, 0.568359f, 0.679688f, -0.5625f, -28.5000f, 18.1250f, 20, 29}, // 0053
{0.705078f, 0.582031f, 0.746094f, 0.638672f, -1.3750f, -28.1875f, 17.3125f, 21, 29}, // 0054
{0.748047f, 0.582031f, 0.789063f, 0.638672f, 0.0625f, -28.1875f, 20.1250f, 21, 29}, // 0055
{0.658203f, 0.560547f, 0.703125f, 0.617188f, -1.6875f, -28.1875f, 18.6875f, 23, 29}, // 0056
{0.923828f, 0.558594f, 0.980469f, 0.615234f, -1.5000f, -28.1875f, 25.8125f, 29, 29}, // 0057
{0.000000f, 0.566406f, 0.042969f, 0.623047f, -1.2500f, -28.1875f, 18.6875f, 22, 29}, // 0058
{0.044922f, 0.566406f, 0.087891f, 0.623047f, -1.5625f, -28.1875f, 18.6875f, 22, 29}, // 0059
{0.078125f, 0.636719f, 0.115234f, 0.693359f, -0.6875f, -28.1875f, 16.6875f, 19, 29}, // 005a
{0.404297f, 0.671875f, 0.423828f, 0.746094f, 0.1250f, -31.8125f, 8.4375f, 10, 38}, // 005b
{0.964844f, 0.292969f, 0.996094f, 0.353516f, -1.6250f, -28.2500f, 12.3750f, 16, 31}, // 005c
{0.941406f, 0.675781f, 0.960938f, 0.750000f, -1.8125f, -31.8125f, 8.3750f, 10, 38}, // 005d
{0.964844f, 0.414063f, 0.994141f, 0.447266f, -1.1250f, -28.2500f, 12.7500f, 15, 17}, // 005e
{0.777344f, 0.699219f, 0.810547f, 0.712891f, -1.8750f, -4.0625f, 13.3125f, 17, 7}, // 005f
{0.705078f, 0.560547f, 0.726563f, 0.578125f, -0.8750f, -29.2500f, 9.8750f, 11, 9}, // 0060
{0.632813f, 0.677734f, 0.667969f, 0.722656f, -0.7500f, -22.3125f, 16.0625f, 18, 23}, // 0061
{0.175781f, 0.578125f, 0.210938f, 0.638672f, -0.0625f, -29.8750f, 16.7500f, 18, 31}, // 0062
{0.832031f, 0.582031f, 0.865234f, 0.626953f, -0.7500f, -22.2500f, 15.4375f, 17, 23}, // 0063
{0.570313f, 0.623047f, 0.605469f, 0.683594f, -0.6875f, -29.8750f, 16.7500f, 18, 31}, // 0064
{0.515625f, 0.681641f, 0.550781f, 0.726563f, -0.7500f, -22.2500f, 15.5000f, 18, 23}, // 0065
{0.486328f, 0.677734f, 0.513672f, 0.738281f, -1.3125f, -30.2500f, 10.0625f, 14, 31}, // 0066
{0.117188f, 0.636719f, 0.152344f, 0.695313f, -0.6250f, -22.3125f, 16.7500f, 18, 30}, // 0067
{0.964844f, 0.169922f, 0.998047f, 0.228516f, -0.1250f, -29.9375f, 16.6875f, 17, 30}, // 0068
{0.982422f, 0.558594f, 0.998047f, 0.617188f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 0069
{0.191406f, 0.640625f, 0.212891f, 0.714844f, -3.1875f, -29.9375f, 7.8125f, 11, 38}, // 006a
{0.154297f, 0.640625f, 0.189453f, 0.699219f, -0.0625f, -29.9375f, 15.5000f, 18, 30}, // 006b
{0.587891f, 0.685547f, 0.603516f, 0.744141f, 0.1875f, -29.9375f, 7.7500f, 8, 30}, // 006c
{0.765625f, 0.400391f, 0.816406f, 0.445313f, -0.0625f, -22.3125f, 25.6875f, 26, 23}, // 006d
{0.037109f, 0.683594f, 0.070313f, 0.728516f, -0.0625f, -22.3125f, 16.8125f, 17, 23}, // 006e
{0.419922f, 0.363281f, 0.457031f, 0.408203f, -0.7500f, -22.2500f, 16.7500f, 19, 23}, // 006f
{0.677734f, 0.640625f, 0.712891f, 0.699219f, -0.0625f, -22.3125f, 16.7500f, 18, 30}, // 0070
{0.714844f, 0.640625f, 0.750000f, 0.699219f, -0.6875f, -22.2500f, 16.7500f, 18, 30}, // 0071
{0.242188f, 0.693359f, 0.267578f, 0.738281f, -0.0625f, -22.3125f, 10.4375f, 13, 23}, // 0072
{0.552734f, 0.685547f, 0.585938f, 0.730469f, -0.8750f, -22.2500f, 15.0000f, 17, 23}, // 0073
{0.214844f, 0.693359f, 0.240234f, 0.746094f, -1.5000f, -26.4375f, 10.1875f, 13, 27}, // 0074
{0.826172f, 0.689453f, 0.859375f, 0.734375f, -0.1250f, -21.9375f, 16.7500f, 17, 23}, // 0075
{0.302734f, 0.494141f, 0.339844f, 0.537109f, -1.5000f, -22.0000f, 15.0000f, 19, 22}, // 0076
{0.212891f, 0.494141f, 0.261719f, 0.537109f, -1.3750f, -22.0000f, 22.0625f, 25, 22}, // 0077
{0.000000f, 0.683594f, 0.035156f, 0.726563f, -1.4375f, -22.0000f, 15.0000f, 18, 22}, // 0078
{0.728516f, 0.490234f, 0.765625f, 0.548828f, -1.6875f, -22.0000f, 15.0000f, 19, 30}, // 0079
{0.962891f, 0.691406f, 0.996094f, 0.734375f, -0.6875f, -22.0000f, 15.0000f, 17, 22}, // 007a
{0.466797f, 0.238281f, 0.492188f, 0.310547f, -1.1250f, -30.5625f, 10.0000f, 13, 37}, // 007b
{0.072266f, 0.695313f, 0.085938f, 0.759766f, 0.1875f, -28.1875f, 7.4375f, 7, 33}, // 007c
{0.964844f, 0.617188f, 0.990234f, 0.689453f, -1.5000f, -30.5625f, 10.0000f, 13, 37}, // 007d
{0.087891f, 0.697266f, 0.126953f, 0.718750f, -0.1875f, -17.3750f, 19.6250f, 20, 11}, // 007e
{0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 0.1875f, 1, 1}, // 007f
// RANGE: 0xfffd - 0xfffe, start 0x7f
{0.882813f, 0.390625f, 0.945313f, 0.486328f, -0.6250f, -39.6875f, 30.1875f, 32, 49}, // fffd
// RANGE: 0xfffd - 0xfffe, start 0x81
{0.146484f, 0.375000f, 0.208984f, 0.470703f, -0.6250f, -39.6875f, 30.1875f, 32, 49}, // fffd
};
const AtlasCharRange font_UBUNTU24_ranges[] = {
{ 32, 128, 0 },
@ -120,41 +120,43 @@ const AtlasFont font_UBUNTU24 = {
const AtlasFont *ui_fonts[1] = {
&font_UBUNTU24,
};
const AtlasImage ui_images[31] = {
{0.311523f, 0.612305f, 0.340820f, 0.641602f, 16, 16, "I_SOLIDWHITE"},
{0.118164f, 0.432617f, 0.176758f, 0.491211f, 31, 31, "I_CROSS"},
{0.370117f, 0.362305f, 0.430664f, 0.422852f, 32, 32, "I_CIRCLE"},
{0.254883f, 0.432617f, 0.309570f, 0.487305f, 29, 29, "I_SQUARE"},
{0.657227f, 0.116211f, 0.721680f, 0.170898f, 34, 29, "I_TRIANGLE"},
{0.721680f, 0.456055f, 0.854492f, 0.479492f, 69, 13, "I_SELECT"},
{0.000977f, 0.465820f, 0.112305f, 0.489258f, 58, 13, "I_START"},
{0.118164f, 0.381836f, 0.141602f, 0.428711f, 13, 25, "I_ARROW"},
{0.000977f, 0.381836f, 0.114258f, 0.461914f, 59, 42, "I_DIR"},
{0.870117f, 0.286133f, 0.973633f, 0.387695f, 54, 53, "I_ROUND"},
{0.370117f, 0.426758f, 0.522461f, 0.483398f, 79, 30, "I_RECT"},
{0.485352f, 0.116211f, 0.653320f, 0.280273f, 87, 85, "I_STICK"},
{0.000977f, 0.000977f, 0.239258f, 0.235352f, 123, 121, "I_STICK_BG"},
{0.143555f, 0.362305f, 0.366211f, 0.428711f, 115, 35, "I_SHOULDER"},
{0.598633f, 0.372070f, 0.717773f, 0.458008f, 62, 45, "I_DIR_LINE"},
{0.870117f, 0.172852f, 0.979492f, 0.282227f, 57, 57, "I_ROUND_LINE"},
{0.721680f, 0.391602f, 0.879883f, 0.452148f, 82, 32, "I_RECT_LINE"},
{0.598633f, 0.297852f, 0.827148f, 0.368164f, 118, 37, "I_SHOULDER_LINE"},
{0.811523f, 0.000977f, 0.983398f, 0.168945f, 89, 87, "I_STICK_LINE"},
{0.243164f, 0.000977f, 0.481445f, 0.233398f, 123, 120, "I_STICK_BG_LINE"},
{0.313477f, 0.432617f, 0.368164f, 0.487305f, 29, 29, "I_CHECKEDBOX"},
{0.657227f, 0.172852f, 0.866211f, 0.293945f, 108, 63, "I_BG"},
{0.243164f, 0.237305f, 0.452148f, 0.358398f, 108, 63, "I_BG_GOLD"},
{0.977539f, 0.362305f, 0.993164f, 0.389648f, 9, 15, "I_L"},
{0.151367f, 0.627930f, 0.174805f, 0.655273f, 13, 15, "I_R"},
{0.143555f, 0.239258f, 0.235352f, 0.331055f, 48, 48, "I_DROP_SHADOW"},
{0.725586f, 0.116211f, 0.795898f, 0.165039f, 37, 26, "I_LINES"},
{0.180664f, 0.432617f, 0.250977f, 0.479492f, 37, 25, "I_GRID"},
{0.485352f, 0.000977f, 0.807617f, 0.112305f, 166, 58, "I_LOGO"},
{0.000977f, 0.239258f, 0.139648f, 0.377930f, 72, 72, "I_ICON"},
{0.456055f, 0.284180f, 0.594727f, 0.422852f, 72, 72, "I_ICONGOLD"},
const AtlasImage ui_images[33] = {
{0.213867f, 0.323242f, 0.243164f, 0.352539f, 16, 16, "I_SOLIDWHITE"},
{0.584961f, 0.491211f, 0.655273f, 0.561523f, 37, 37, "I_CROSS"},
{0.747070f, 0.323242f, 0.821289f, 0.397461f, 39, 39, "I_CIRCLE"},
{0.659180f, 0.491211f, 0.725586f, 0.557617f, 35, 35, "I_SQUARE"},
{0.502930f, 0.491211f, 0.581055f, 0.557617f, 41, 35, "I_TRIANGLE"},
{0.213867f, 0.543945f, 0.374023f, 0.573242f, 83, 16, "I_SELECT"},
{0.729492f, 0.549805f, 0.862305f, 0.579102f, 69, 16, "I_START"},
{0.911133f, 0.676758f, 0.938477f, 0.733398f, 15, 30, "I_ARROW"},
{0.000977f, 0.483398f, 0.114258f, 0.563477f, 59, 42, "I_DIR"},
{0.887695f, 0.454102f, 0.991211f, 0.555664f, 54, 53, "I_ROUND"},
{0.346680f, 0.483398f, 0.499023f, 0.540039f, 79, 30, "I_RECT"},
{0.708008f, 0.000977f, 0.875977f, 0.165039f, 87, 85, "I_STICK"},
{0.254883f, 0.000977f, 0.493164f, 0.235352f, 123, 121, "I_STICK_BG"},
{0.346680f, 0.413086f, 0.569336f, 0.479492f, 115, 35, "I_SHOULDER"},
{0.000977f, 0.375977f, 0.143555f, 0.479492f, 74, 54, "I_DIR_LINE"},
{0.213867f, 0.364258f, 0.342773f, 0.491211f, 67, 66, "I_ROUND_LINE"},
{0.573242f, 0.413086f, 0.762695f, 0.487305f, 98, 39, "I_RECT_LINE"},
{0.467773f, 0.323242f, 0.743164f, 0.409180f, 142, 45, "I_SHOULDER_LINE"},
{0.497070f, 0.000977f, 0.704102f, 0.204102f, 107, 105, "I_STICK_LINE"},
{0.000977f, 0.000977f, 0.250977f, 0.247070f, 129, 127, "I_STICK_BG_LINE"},
{0.377930f, 0.543945f, 0.444336f, 0.610352f, 35, 35, "I_CHECKEDBOX"},
{0.254883f, 0.239258f, 0.463867f, 0.360352f, 108, 63, "I_BG"},
{0.000977f, 0.250977f, 0.209961f, 0.372070f, 108, 63, "I_BG_GOLD"},
{0.424805f, 0.614258f, 0.444336f, 0.647461f, 11, 18, "I_L"},
{0.776367f, 0.168945f, 0.805664f, 0.202148f, 16, 18, "I_R"},
{0.118164f, 0.483398f, 0.209961f, 0.575195f, 48, 48, "I_DROP_SHADOW"},
{0.879883f, 0.106445f, 0.950195f, 0.155273f, 37, 26, "I_LINES"},
{0.346680f, 0.364258f, 0.416992f, 0.411133f, 37, 25, "I_GRID"},
{0.497070f, 0.208008f, 0.819336f, 0.319336f, 166, 58, "I_LOGO"},
{0.823242f, 0.168945f, 0.961914f, 0.307617f, 72, 72, "I_ICON"},
{0.823242f, 0.311523f, 0.961914f, 0.450195f, 72, 72, "I_ICONGOLD"},
{0.879883f, 0.000977f, 0.993164f, 0.102539f, 59, 53, "I_FOLDER"},
{0.766602f, 0.454102f, 0.883789f, 0.545898f, 61, 48, "I_UP_DIRECTORY"},
};
const Atlas ui_atlas = {
"ui_atlas.zim",
ui_fonts, 1,
ui_images, 31,
ui_images, 33,
};

Binary file not shown.

Binary file not shown.

View File

@ -32,3 +32,5 @@ image I_GRID source_assets/image/grid.png copy
image I_LOGO source_assets/image/logo.png copy
image I_ICON source_assets/image/icon_regular_72.png copy
image I_ICONGOLD source_assets/image/icon_gold_72.png copy
image I_FOLDER source_assets/image/folder_line.png copy
image I_UP_DIRECTORY source_assets/image/up_line.png copy

View File

@ -31,3 +31,5 @@ image I_GRID source_assets/image/grid.png copy
image I_LOGO source_assets/image/logo.png copy
image I_ICON source_assets/image/icon_regular_72.png copy
image I_ICONGOLD source_assets/image/icon_gold_72.png copy
image I_FOLDER source_assets/image/folder_line.png copy
image I_UP_DIRECTORY source_assets/image/up_line.png copy

2
native

@ -1 +1 @@
Subproject commit ca6355d8598b788bdb0ef585b542d4a08c00f31d
Subproject commit d680a346dc0d243a1e46018e83846de83d533fb0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 377 B

After

Width:  |  Height:  |  Size: 530 B

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 973 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 645 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 875 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 536 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 913 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 863 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 720 B

After

Width:  |  Height:  |  Size: 1.3 KiB