From 45428dd17be5ad55dd6123ab884a46003bfebed4 Mon Sep 17 00:00:00 2001 From: Aloshi Date: Tue, 25 Mar 2014 18:10:35 -0500 Subject: [PATCH] Added new TextEditComponent graphics. --- CMakeLists.txt | 1 + data/ResourceUtil.cpp | 34 +++--- data/Resources.h | 3 + data/converted/textinput_ninepatch_png.cpp | 135 +++++++++++++++++++++ data/resources/textinput_ninepatch.png | Bin 0 -> 1275 bytes src/components/TextEditComponent.cpp | 2 +- 6 files changed, 158 insertions(+), 17 deletions(-) create mode 100644 data/converted/textinput_ninepatch_png.cpp create mode 100644 data/resources/textinput_ninepatch.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 15b61c55e..a777915f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,6 +307,7 @@ set(ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/ES_logo_32_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/button_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/button_filled_png.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/textinput_ninepatch_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/frame_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/scroll_gradient_png.cpp diff --git a/data/ResourceUtil.cpp b/data/ResourceUtil.cpp index 588a0e5d9..11d5a1551 100644 --- a/data/ResourceUtil.cpp +++ b/data/ResourceUtil.cpp @@ -2,7 +2,7 @@ #include "Resources.h" -const size_t res2hNrOfFiles = 34; +const size_t res2hNrOfFiles = 35; const Res2hEntry res2hFiles[res2hNrOfFiles] = { {":/arrow.svg", arrow_svg_size, arrow_svg_data}, {":/button.png", button_png_size, button_png_data}, @@ -23,6 +23,7 @@ const Res2hEntry res2hFiles[res2hNrOfFiles] = { {":/slider_knob.svg", slider_knob_svg_size, slider_knob_svg_data}, {":/star_filled.svg", star_filled_svg_size, star_filled_svg_data}, {":/star_unfilled.svg", star_unfilled_svg_size, star_unfilled_svg_data}, + {":/textinput_ninepatch.png", textinput_ninepatch_png_size, textinput_ninepatch_png_data}, {":/help/button_a.svg", help_button_a_svg_size, help_button_a_svg_data}, {":/help/button_b.svg", help_button_b_svg_size, help_button_b_svg_data}, {":/help/button_l.svg", help_button_l_svg_size, help_button_l_svg_data}, @@ -60,21 +61,22 @@ res2hMapType::value_type mapTemp[] = { std::make_pair(":/slider_knob.svg", res2hFiles[16]), std::make_pair(":/star_filled.svg", res2hFiles[17]), std::make_pair(":/star_unfilled.svg", res2hFiles[18]), - std::make_pair(":/help/button_a.svg", res2hFiles[19]), - std::make_pair(":/help/button_b.svg", res2hFiles[20]), - std::make_pair(":/help/button_l.svg", res2hFiles[21]), - std::make_pair(":/help/button_r.svg", res2hFiles[22]), - std::make_pair(":/help/button_select.svg", res2hFiles[23]), - std::make_pair(":/help/button_start.svg", res2hFiles[24]), - std::make_pair(":/help/button_x.svg", res2hFiles[25]), - std::make_pair(":/help/button_y.svg", res2hFiles[26]), - std::make_pair(":/help/dpad_all.svg", res2hFiles[27]), - std::make_pair(":/help/dpad_down.svg", res2hFiles[28]), - std::make_pair(":/help/dpad_left.svg", res2hFiles[29]), - std::make_pair(":/help/dpad_leftright.svg", res2hFiles[30]), - std::make_pair(":/help/dpad_right.svg", res2hFiles[31]), - std::make_pair(":/help/dpad_up.svg", res2hFiles[32]), - std::make_pair(":/help/dpad_updown.svg", res2hFiles[33]) + std::make_pair(":/textinput_ninepatch.png", res2hFiles[19]), + std::make_pair(":/help/button_a.svg", res2hFiles[20]), + std::make_pair(":/help/button_b.svg", res2hFiles[21]), + std::make_pair(":/help/button_l.svg", res2hFiles[22]), + std::make_pair(":/help/button_r.svg", res2hFiles[23]), + std::make_pair(":/help/button_select.svg", res2hFiles[24]), + std::make_pair(":/help/button_start.svg", res2hFiles[25]), + std::make_pair(":/help/button_x.svg", res2hFiles[26]), + std::make_pair(":/help/button_y.svg", res2hFiles[27]), + std::make_pair(":/help/dpad_all.svg", res2hFiles[28]), + std::make_pair(":/help/dpad_down.svg", res2hFiles[29]), + std::make_pair(":/help/dpad_left.svg", res2hFiles[30]), + std::make_pair(":/help/dpad_leftright.svg", res2hFiles[31]), + std::make_pair(":/help/dpad_right.svg", res2hFiles[32]), + std::make_pair(":/help/dpad_up.svg", res2hFiles[33]), + std::make_pair(":/help/dpad_updown.svg", res2hFiles[34]) }; res2hMapType res2hMap(mapTemp, mapTemp + sizeof mapTemp / sizeof mapTemp[0]); diff --git a/data/Resources.h b/data/Resources.h index 090c2c4dd..1a7f4c031 100644 --- a/data/Resources.h +++ b/data/Resources.h @@ -62,6 +62,9 @@ extern const unsigned char star_filled_svg_data[]; extern const size_t star_unfilled_svg_size; extern const unsigned char star_unfilled_svg_data[]; +extern const size_t textinput_ninepatch_png_size; +extern const unsigned char textinput_ninepatch_png_data[]; + extern const size_t help_button_a_svg_size; extern const unsigned char help_button_a_svg_data[]; diff --git a/data/converted/textinput_ninepatch_png.cpp b/data/converted/textinput_ninepatch_png.cpp new file mode 100644 index 000000000..21387e40d --- /dev/null +++ b/data/converted/textinput_ninepatch_png.cpp @@ -0,0 +1,135 @@ +//this file was auto-generated from "textinput_ninepatch.png" by res2h + +#include "../Resources.h" + +const size_t textinput_ninepatch_png_size = 1275; +const unsigned char textinput_ninepatch_png_data[1275] = { + 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00, + 0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30, + 0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57, + 0x02,0xf9,0x87,0x00,0x00,0x00,0x19,0x74,0x45,0x58, + 0x74,0x53,0x6f,0x66,0x74,0x77,0x61,0x72,0x65,0x00, + 0x41,0x64,0x6f,0x62,0x65,0x20,0x49,0x6d,0x61,0x67, + 0x65,0x52,0x65,0x61,0x64,0x79,0x71,0xc9,0x65,0x3c, + 0x00,0x00,0x03,0x68,0x69,0x54,0x58,0x74,0x58,0x4d, + 0x4c,0x3a,0x63,0x6f,0x6d,0x2e,0x61,0x64,0x6f,0x62, + 0x65,0x2e,0x78,0x6d,0x70,0x00,0x00,0x00,0x00,0x00, + 0x3c,0x3f,0x78,0x70,0x61,0x63,0x6b,0x65,0x74,0x20, + 0x62,0x65,0x67,0x69,0x6e,0x3d,0x22,0xef,0xbb,0xbf, + 0x22,0x20,0x69,0x64,0x3d,0x22,0x57,0x35,0x4d,0x30, + 0x4d,0x70,0x43,0x65,0x68,0x69,0x48,0x7a,0x72,0x65, + 0x53,0x7a,0x4e,0x54,0x63,0x7a,0x6b,0x63,0x39,0x64, + 0x22,0x3f,0x3e,0x20,0x3c,0x78,0x3a,0x78,0x6d,0x70, + 0x6d,0x65,0x74,0x61,0x20,0x78,0x6d,0x6c,0x6e,0x73, + 0x3a,0x78,0x3d,0x22,0x61,0x64,0x6f,0x62,0x65,0x3a, + 0x6e,0x73,0x3a,0x6d,0x65,0x74,0x61,0x2f,0x22,0x20, + 0x78,0x3a,0x78,0x6d,0x70,0x74,0x6b,0x3d,0x22,0x41, + 0x64,0x6f,0x62,0x65,0x20,0x58,0x4d,0x50,0x20,0x43, + 0x6f,0x72,0x65,0x20,0x35,0x2e,0x33,0x2d,0x63,0x30, + 0x31,0x31,0x20,0x36,0x36,0x2e,0x31,0x34,0x35,0x36, + 0x36,0x31,0x2c,0x20,0x32,0x30,0x31,0x32,0x2f,0x30, + 0x32,0x2f,0x30,0x36,0x2d,0x31,0x34,0x3a,0x35,0x36, + 0x3a,0x32,0x37,0x20,0x20,0x20,0x20,0x20,0x20,0x20, + 0x20,0x22,0x3e,0x20,0x3c,0x72,0x64,0x66,0x3a,0x52, + 0x44,0x46,0x20,0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x72, + 0x64,0x66,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f, + 0x2f,0x77,0x77,0x77,0x2e,0x77,0x33,0x2e,0x6f,0x72, + 0x67,0x2f,0x31,0x39,0x39,0x39,0x2f,0x30,0x32,0x2f, + 0x32,0x32,0x2d,0x72,0x64,0x66,0x2d,0x73,0x79,0x6e, + 0x74,0x61,0x78,0x2d,0x6e,0x73,0x23,0x22,0x3e,0x20, + 0x3c,0x72,0x64,0x66,0x3a,0x44,0x65,0x73,0x63,0x72, + 0x69,0x70,0x74,0x69,0x6f,0x6e,0x20,0x72,0x64,0x66, + 0x3a,0x61,0x62,0x6f,0x75,0x74,0x3d,0x22,0x22,0x20, + 0x78,0x6d,0x6c,0x6e,0x73,0x3a,0x78,0x6d,0x70,0x4d, + 0x4d,0x3d,0x22,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f, + 0x6e,0x73,0x2e,0x61,0x64,0x6f,0x62,0x65,0x2e,0x63, + 0x6f,0x6d,0x2f,0x78,0x61,0x70,0x2f,0x31,0x2e,0x30, + 0x2f,0x6d,0x6d,0x2f,0x22,0x20,0x78,0x6d,0x6c,0x6e, + 0x73,0x3a,0x73,0x74,0x52,0x65,0x66,0x3d,0x22,0x68, + 0x74,0x74,0x70,0x3a,0x2f,0x2f,0x6e,0x73,0x2e,0x61, + 0x64,0x6f,0x62,0x65,0x2e,0x63,0x6f,0x6d,0x2f,0x78, + 0x61,0x70,0x2f,0x31,0x2e,0x30,0x2f,0x73,0x54,0x79, + 0x70,0x65,0x2f,0x52,0x65,0x73,0x6f,0x75,0x72,0x63, + 0x65,0x52,0x65,0x66,0x23,0x22,0x20,0x78,0x6d,0x6c, + 0x6e,0x73,0x3a,0x78,0x6d,0x70,0x3d,0x22,0x68,0x74, + 0x74,0x70,0x3a,0x2f,0x2f,0x6e,0x73,0x2e,0x61,0x64, + 0x6f,0x62,0x65,0x2e,0x63,0x6f,0x6d,0x2f,0x78,0x61, + 0x70,0x2f,0x31,0x2e,0x30,0x2f,0x22,0x20,0x78,0x6d, + 0x70,0x4d,0x4d,0x3a,0x4f,0x72,0x69,0x67,0x69,0x6e, + 0x61,0x6c,0x44,0x6f,0x63,0x75,0x6d,0x65,0x6e,0x74, + 0x49,0x44,0x3d,0x22,0x78,0x6d,0x70,0x2e,0x64,0x69, + 0x64,0x3a,0x45,0x39,0x31,0x35,0x37,0x37,0x33,0x42, + 0x31,0x31,0x32,0x30,0x36,0x38,0x31,0x31,0x38,0x30, + 0x38,0x33,0x43,0x37,0x45,0x33,0x31,0x45,0x41,0x35, + 0x41,0x37,0x35,0x33,0x22,0x20,0x78,0x6d,0x70,0x4d, + 0x4d,0x3a,0x44,0x6f,0x63,0x75,0x6d,0x65,0x6e,0x74, + 0x49,0x44,0x3d,0x22,0x78,0x6d,0x70,0x2e,0x64,0x69, + 0x64,0x3a,0x33,0x42,0x37,0x42,0x36,0x33,0x37,0x36, + 0x39,0x44,0x38,0x38,0x31,0x31,0x45,0x33,0x41,0x39, + 0x31,0x44,0x42,0x44,0x46,0x44,0x34,0x30,0x39,0x39, + 0x32,0x45,0x45,0x33,0x22,0x20,0x78,0x6d,0x70,0x4d, + 0x4d,0x3a,0x49,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65, + 0x49,0x44,0x3d,0x22,0x78,0x6d,0x70,0x2e,0x69,0x69, + 0x64,0x3a,0x39,0x38,0x44,0x38,0x30,0x39,0x45,0x34, + 0x39,0x44,0x38,0x37,0x31,0x31,0x45,0x33,0x41,0x39, + 0x31,0x44,0x42,0x44,0x46,0x44,0x34,0x30,0x39,0x39, + 0x32,0x45,0x45,0x33,0x22,0x20,0x78,0x6d,0x70,0x3a, + 0x43,0x72,0x65,0x61,0x74,0x6f,0x72,0x54,0x6f,0x6f, + 0x6c,0x3d,0x22,0x41,0x64,0x6f,0x62,0x65,0x20,0x50, + 0x68,0x6f,0x74,0x6f,0x73,0x68,0x6f,0x70,0x20,0x43, + 0x53,0x36,0x20,0x28,0x4d,0x61,0x63,0x69,0x6e,0x74, + 0x6f,0x73,0x68,0x29,0x22,0x3e,0x20,0x3c,0x78,0x6d, + 0x70,0x4d,0x4d,0x3a,0x44,0x65,0x72,0x69,0x76,0x65, + 0x64,0x46,0x72,0x6f,0x6d,0x20,0x73,0x74,0x52,0x65, + 0x66,0x3a,0x69,0x6e,0x73,0x74,0x61,0x6e,0x63,0x65, + 0x49,0x44,0x3d,0x22,0x78,0x6d,0x70,0x2e,0x69,0x69, + 0x64,0x3a,0x45,0x39,0x31,0x35,0x37,0x37,0x33,0x42, + 0x31,0x31,0x32,0x30,0x36,0x38,0x31,0x31,0x38,0x30, + 0x38,0x33,0x43,0x37,0x45,0x33,0x31,0x45,0x41,0x35, + 0x41,0x37,0x35,0x33,0x22,0x20,0x73,0x74,0x52,0x65, + 0x66,0x3a,0x64,0x6f,0x63,0x75,0x6d,0x65,0x6e,0x74, + 0x49,0x44,0x3d,0x22,0x78,0x6d,0x70,0x2e,0x64,0x69, + 0x64,0x3a,0x45,0x39,0x31,0x35,0x37,0x37,0x33,0x42, + 0x31,0x31,0x32,0x30,0x36,0x38,0x31,0x31,0x38,0x30, + 0x38,0x33,0x43,0x37,0x45,0x33,0x31,0x45,0x41,0x35, + 0x41,0x37,0x35,0x33,0x22,0x2f,0x3e,0x20,0x3c,0x2f, + 0x72,0x64,0x66,0x3a,0x44,0x65,0x73,0x63,0x72,0x69, + 0x70,0x74,0x69,0x6f,0x6e,0x3e,0x20,0x3c,0x2f,0x72, + 0x64,0x66,0x3a,0x52,0x44,0x46,0x3e,0x20,0x3c,0x2f, + 0x78,0x3a,0x78,0x6d,0x70,0x6d,0x65,0x74,0x61,0x3e, + 0x20,0x3c,0x3f,0x78,0x70,0x61,0x63,0x6b,0x65,0x74, + 0x20,0x65,0x6e,0x64,0x3d,0x22,0x72,0x22,0x3f,0x3e, + 0x18,0xec,0x12,0x45,0x00,0x00,0x01,0x29,0x49,0x44, + 0x41,0x54,0x78,0xda,0xec,0x9a,0x41,0x6a,0x02,0x31, + 0x18,0x85,0x7f,0x43,0xc0,0xad,0xd1,0x13,0x98,0x55, + 0xb1,0x17,0xa8,0x7b,0x6f,0xe0,0x62,0x4e,0xa0,0x14, + 0x7a,0xa1,0x62,0x6f,0x20,0x78,0x0d,0xa7,0xeb,0x2e, + 0xa4,0xba,0x88,0x37,0x98,0xb8,0x55,0xa6,0x33,0xfd, + 0x5f,0x49,0xc1,0x45,0x0f,0x90,0xd0,0xf7,0xe0,0x41, + 0x60,0x36,0xdf,0x97,0x64,0x56,0xf9,0x07,0x7d,0xdf, + 0x4b,0xfd,0x5e,0x1b,0x11,0x79,0xd6,0xae,0xb5,0x0f, + 0xda,0xa1,0xe4,0x99,0xab,0xf6,0x53,0xbb,0xd1,0xbe, + 0xce,0x9f,0xe6,0xdd,0x60,0x5f,0xef,0x01,0xbf,0xd5, + 0x2e,0xa5,0xac,0xec,0xb4,0x95,0x4d,0xbb,0xbe,0xb4, + 0xd6,0x8a,0xf7,0x5e,0xdc,0xc8,0x89,0x31,0x26,0x4b, + 0xe2,0xae,0xeb,0x24,0x5e,0xa2,0x84,0x10,0xa4,0x6d, + 0x5b,0x6c,0xf8,0x0a,0xa4,0x2b,0x7c,0xf4,0x53,0x2f, + 0x93,0xf1,0x24,0x5b,0x78,0x04,0x6c,0x60,0x04,0x6b, + 0xca,0x1a,0xb4,0x8f,0x58,0x39,0xe7,0x8a,0xb9,0x3b, + 0x77,0xac,0x33,0xf3,0xfb,0xc3,0xe6,0xbc,0xf3,0x7f, + 0x9d,0x44,0xca,0xd0,0x48,0xe1,0xa1,0x00,0x05,0x28, + 0x40,0x01,0x0a,0x50,0x80,0x02,0x14,0xa0,0x00,0x05, + 0x28,0x40,0x01,0x0a,0x50,0x80,0x02,0x14,0xa0,0x00, + 0x05,0x28,0x40,0x01,0x0a,0x50,0x80,0x02,0x14,0xa0, + 0x00,0x05,0xfe,0xa3,0x00,0x9e,0xef,0x7f,0x1e,0x91, + 0x4b,0xc9,0x1d,0xeb,0x15,0x02,0x07,0xac,0x62,0x8c, + 0xc5,0x08,0xe0,0xb5,0x3e,0xe5,0x00,0x01,0x0c,0x4e, + 0x48,0x38,0x07,0x69,0x9a,0x46,0x30,0xfc,0x91,0x6b, + 0xc0,0x06,0x46,0x8c,0x1a,0xa4,0x6c,0x6c,0x12,0x58, + 0x60,0xf6,0xe0,0x78,0x3a,0x96,0x74,0xfd,0x31,0xec, + 0xf1,0x66,0x30,0xb2,0xa2,0x8b,0x4a,0xfb,0xa2,0xfd, + 0xd0,0xde,0x32,0x86,0xbe,0x25,0x46,0xb0,0x56,0xca, + 0xfe,0xf5,0x2d,0xc0,0x00,0x3b,0xe6,0x51,0x95,0x79, + 0xeb,0x7d,0x04,0x00,0x00,0x00,0x00,0x49,0x45,0x4e, + 0x44,0xae,0x42,0x60,0x82 +}; diff --git a/data/resources/textinput_ninepatch.png b/data/resources/textinput_ninepatch.png new file mode 100644 index 0000000000000000000000000000000000000000..9ba16d6f294c26d9a65989a72ee58c19fc38a044 GIT binary patch literal 1275 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%o&*>5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8KW+g=7RhMR$W{Yl!|Z$R@KEJl?AE#L8-<0 zrA5iW_()TRX$FQJev3c~fv&OgFUkZ)N@9*nesXDUYF>$_i>(q+MlU5Z#md#v(A3=A z*vZh)$iU3P(9pub!r0l|)!5M0(bUo0)EH(4HoeA9=1ykD=4O^I7C@b@#*UVTE>13P zE+z(+mPW3waJ`;+#U+V($*C}VGlBM6TDVvkSh|`3^_t_~2E*d&d1&^_H%Avt_F9 z?tNRXb$yS!bE4Bw&HK^1*D7&~S_GElM(6zCTB2R^C0Kv*N0sObmYf8Z>{C)(`Xel# zckQ$;Ut|3F_u*%IKG)B6Id#F~;X(#h4F^W9fCeU!1-O|17BkFyUoSV&`=sn^Q6}~^ zNj*n79&ELH%D~9u=V8H~Im^x9&&2ElY;HYLOLB6AA`-qmsIZz=^4IXq$25aYi@Lpj qFZz4oo>ALARksacr~ZA_J-}f7EO2V&>sl62apdXh=d#Wzp$Pze+_d`u literal 0 HcmV?d00001 diff --git a/src/components/TextEditComponent.cpp b/src/components/TextEditComponent.cpp index 49a0b6308..f69b0a902 100644 --- a/src/components/TextEditComponent.cpp +++ b/src/components/TextEditComponent.cpp @@ -12,7 +12,7 @@ #define CURSOR_REPEAT_SPEED 28 // lower is faster TextEditComponent::TextEditComponent(Window* window) : GuiComponent(window), - mBox(window, ":/button.png"), mFocused(false), + mBox(window, ":/textinput_ninepatch.png"), mFocused(false), mScrollOffset(0.0f, 0.0f), mCursor(0), mEditing(false), mFont(Font::get(FONT_SIZE_MEDIUM, FONT_PATH_LIGHT)) { addChild(&mBox);