diff --git a/src/widget.cpp b/src/widget.cpp index b8103fb8d0..7af6862e5f 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1857,53 +1857,6 @@ void NWidgetBackground::Draw(const Window *w) } } - -/* - Ornament image - - . . . . . . . . . . . . 0 - . . . . . . . . . . . . 1 - + + . . . + . + . . . + 2 - . . + + . . + . . + + . 3 - . . . . + . . . + . . . 4 - . . . . . + . + . . . . 5 - . . . . . . + . . . . . 6 - . . . . . . + . . . . . 7 - . . + . . + . + . . + . 8 - . . . + + . . . + + . . 9 - 0 1 2 3 4 5 6 7 8 9 0 1 -*/ - -static unsigned char ornamentImg[][2] = { - { 0, 2 - 1, }, - { 1, 2 - 1, }, - { 2, 3 - 1, }, - { 3, 3 - 1, }, - { 4, 4 - 1, }, - { 5, 5 - 1, }, - { 5, 2 - 1, }, - { 6, 6 - 1, }, - { 6, 3 - 1, }, - { 7, 5 - 1, }, - { 7, 2 - 1, }, - { 8, 4 - 1, }, - { 9, 3 - 1, }, - { 10, 3 - 1, }, - { 11, 2 - 1, }, - -// { 2, 8 - 1, }, -// { 3, 9 - 1, }, -// { 4, 9 - 1, }, -// { 5, 8 - 1, }, -// { 6, 7 - 1, }, -// { 7, 8 - 1, }, -// { 8, 9 - 1, }, -// { 9, 9 - 1, }, -// { 10, 8 - 1, }, -}; - -enum { ORNAMENT_STEP = 12, ORNAMENT_IMG_LEN = sizeof(ornamentImg) / sizeof(ornamentImg[0]) }; - void NWidgetBackground::DrawEdgeOrnament(const Window *w) { if (this->pos_x == 0) { @@ -1932,6 +1885,183 @@ void NWidgetBackground::DrawEdgeOrnament(const Window *w) } } +/* + Ornament image 1 + + . . . . . . . . . . . . . . . . 0 + + + . . . . . . . . . + + + + + 1 + . . + + . . . . . + + . . . . . 2 + . . . . + . . . + . . . . . . . 3 + . . . . . + . + . . . . . . . . 4 + . . . . . . + . . . . . . . . . 5 + . . . . . . + . . . . . . . . . 6 + . . + . . + . + . . + . . . . . 7 + . . . + + . . . + + . . . . . . 8 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 + +static const unsigned char ornamentImg[][2] = { + { 0, 1, }, + { 1, 1, }, + { 2, 2, }, + { 3, 2, }, + { 4, 3, }, + { 5, 4, }, + { 6, 5, }, + { 7, 4, }, + { 8, 3, }, + { 9, 2, }, + { 10, 2, }, + { 11, 1, }, + { 12, 1, }, + { 13, 1, }, + { 14, 1, }, + { 15, 1, }, + + { 2, 7, }, + { 3, 8, }, + { 4, 8, }, + { 5, 7, }, + { 6, 6, }, + { 7, 7, }, + { 8, 8, }, + { 9, 8, }, + { 10, 7, }, +}; +*/ + + +/* + Ornament image 2 - curls + +*/ +/* +static const unsigned char ornamentImg[][2] = { + { 0, 5, }, + { 1, 5, }, + { 2, 4, }, + { 3, 4, }, + { 4, 3, }, + { 5, 3, }, + { 6, 2, }, + { 7, 2, }, + { 8, 1, }, + { 9, 1, }, + { 10, 1, }, + { 11, 1, }, + { 12, 1, }, + { 13, 1, }, + { 14, 2, }, + { 15, 3, }, + { 15, 4, }, + { 14, 5, }, + { 13, 6, }, + { 12, 6, }, + { 11, 5, }, +}; +*/ + +/* + Ornament image 3 + + . . . . . . . . . . . . . . . . 0 + . . . . . . . + + + . . . + + . 1 + . . . . + + + . . . + . + . . + 2 + . + + + . . . . . . . + . . . . 3 + + . . . . . . . . . . + . . . . 4 + . . . . . . . + . . + . + . . + 5 + . . . . . . . . + + . . . + + . 6 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 +*/ + +/* + Ornament image 4 + + . . . . . . . . . . . . . . . . 0 + + + + + + + + + + + . . . + + + 1 + . . . . . . . . . . + . + . . . 2 + . . . . . . . . . . . + . . . . 3 + . . . . . . . . . . . + . . . . 4 + . . . . . . . + . . + . + . . + 5 + . . . . . . . . + + . . . + + . 6 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 +*/ +/* +static const unsigned char ornamentImg[][2] = { + { 0, 1, }, + { 1, 1, }, + { 2, 1, }, + { 3, 1, }, + { 4, 1, }, + { 5, 1, }, + { 6, 1, }, + { 7, 1, }, + { 8, 1, }, + { 9, 1, }, + { 10, 2, }, + { 11, 3, }, + { 11, 4, }, + { 10, 5, }, + { 9, 6, }, + { 8, 6, }, + { 7, 5, }, + + { 12, 2, }, + { 12, 5, }, + { 13, 1, }, + { 13, 6, }, + { 14, 1, }, + { 14, 6, }, + { 15, 1, }, + { 15, 5, }, +}; +*/ + +/* + Ornament image 5 + + . . . . . . . . . . . . . . . . 0 + . . . . . . . + + + . . . + + + 1 + + + . . . + + . . . + . + . . . 2 + . . + . + . . . . . . + . . . . 3 + . . . + . . . . . . . + . . . . 4 + . . . . . . . + . . + . + . . + 5 + . . . . . . . . + + . . . + + . 6 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 +*/ + +static const unsigned char ornamentImg[][2] = { + { 0, 2, }, + { 1, 2, }, + { 2, 3, }, + { 3, 4, }, + { 4, 3, }, + { 5, 2, }, + { 6, 2, }, + { 7, 1, }, + { 8, 1, }, + { 9, 1, }, + { 10, 2, }, + { 11, 3, }, + { 11, 4, }, + { 10, 5, }, + { 9, 6, }, + { 8, 6, }, + { 7, 5, }, + + { 12, 2, }, + { 12, 5, }, + { 13, 1, }, + { 13, 6, }, + { 14, 1, }, + { 14, 6, }, + { 15, 1, }, + { 15, 5, }, +}; + + +enum { ORNAMENT_STEP = 16, ORNAMENT_IMG_LEN = sizeof(ornamentImg) / sizeof(ornamentImg[0]) }; + + void NWidgetBackground::DrawEdgeOrnamentL(const Window *w) { if (_cur_dpi == NULL || _cur_dpi->zoom != ZOOM_LVL_NORMAL) return;