From 17184feccd966ab30630f4efca3514d20b539c5c Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 17 Dec 2021 10:41:38 +0000 Subject: [PATCH] pixie: small skin improvements git-svn-id: svn://kolibrios.org@9434 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/pixie2/pixie.c | 33 +++++++++++++++---------------- programs/cmm/pixie2/pixieskn.png | Bin 1794 -> 1760 bytes 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 7124282d4..7b68a3bba 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -265,18 +265,17 @@ void draw_window() { void DrawTopPanel() { int kfont_width; - int button_y; //Mode depended if (window_mode == WINDOW_MODE_NORMAL) { - button_y = 46; + #define BIGBUTTON_Y 46 img_draw stdcall(skin.image, 0, 0, skin.w, skin.h, 0, 0); if (playback_mode != PLAYBACK_MODE_STOPED) - img_draw stdcall(skin.image, 47, button_y, 41, 21, skin.w+1, WIN_H_SMALL+1); + img_draw stdcall(skin.image, 47, BIGBUTTON_Y, 41, 21, skin.w+1, WIN_H_SMALL+1); if (repeat) - img_draw stdcall(skin.image, 217, button_y+2, 17,17,skin.w+43, WIN_H_SMALL+1); + img_draw stdcall(skin.image, 189, BIGBUTTON_Y+5, 14,14,skin.w+44, WIN_H_SMALL+3); if (shuffle) - img_draw stdcall(skin.image, 236, button_y+2, 17,17, skin.w+62, WIN_H_SMALL+1); + img_draw stdcall(skin.image, 212, BIGBUTTON_Y+5, 14,14, skin.w+59, WIN_H_SMALL+3); if (!work_folder) DrawPixieTitle("Pixie"); else DrawPixieTitle(#work_folder + strrchr(#work_folder, '/')); @@ -284,30 +283,30 @@ void DrawTopPanel() theme.color_top_panel_song_name, list.font_type, #current_filename); if (kfont_width>skin.w-15) DrawBar(skin.w-1, 24, 1, list.item_h, theme.color_list_border); //Playing control buttons - DefineHiddenButton(7, button_y, 38, 20, BUTTON_PLAYBACK_PREV); - DefineHiddenButton(48, button_y, 38, 20, BUTTON_PLAYBACK_PLAY_PAUSE); - DefineHiddenButton(87, button_y, 38, 20, BUTTON_PLAYBACK_NEXT); + DefineHiddenButton(7, BIGBUTTON_Y, 38, 20, BUTTON_PLAYBACK_PREV); + DefineHiddenButton(48, BIGBUTTON_Y, 38, 20, BUTTON_PLAYBACK_PLAY_PAUSE); + DefineHiddenButton(87, BIGBUTTON_Y, 38, 20, BUTTON_PLAYBACK_NEXT); //Window control buttons DefineHiddenButton(Form.width - 27, 1, 26, 15, BUTTON_WINDOW_CLOSE); DefineHiddenButton(Form.width - 55, 1, 26, 15, BUTTON_WINDOW_MINIMIZE); DefineHiddenButton(Form.width - 83, 1, 26, 15, BUTTON_WINDOW_REDUCE); //Other buttons - DefineHiddenButton(218, button_y+3, 17, 16, BUTTON_REPEAT); - DefineHiddenButton(237, button_y+3, 17, 16, BUTTON_SHUFFLE); - DefineHiddenButton(270, button_y+3, 17, 16, BUTTON_OPEN_DIALOG); - DefineHiddenButton(289, button_y+3, 17, 16, BUTTON_SHOW_VOLUME); + DefineHiddenButton(185, BIGBUTTON_Y+3, 22, 16, BUTTON_REPEAT); + DefineHiddenButton(208, BIGBUTTON_Y+3, 22, 16, BUTTON_SHUFFLE); + DefineHiddenButton(259, BIGBUTTON_Y+3, 18, 16, BUTTON_OPEN_DIALOG); + DefineHiddenButton(289, BIGBUTTON_Y+3, 18, 16, BUTTON_SHOW_VOLUME); } else if (window_mode == WINDOW_MODE_SMALL) { - button_y = 7; + #define SMBUTTON_Y 7 img_draw stdcall(skin.image, 0, 0, WIN_W_SMALL, WIN_H_SMALL, skin.w-1, 0); if (playback_mode != PLAYBACK_MODE_STOPED) - img_draw stdcall(skin.image, 46, button_y-1, 27, 19, skin.w+83, WIN_H_SMALL+1); + img_draw stdcall(skin.image, 46, SMBUTTON_Y-1, 27, 19, skin.w+83, WIN_H_SMALL+1); DefineHiddenButton(0, 0, WIN_W_SMALL, WIN_H_SMALL, 99 + BT_NOFRAME); //Playing control buttons - DefineHiddenButton(20, button_y, 24, 16, BUTTON_PLAYBACK_PREV); - DefineHiddenButton(46, button_y, 24, 16, BUTTON_PLAYBACK_PLAY_PAUSE); - DefineHiddenButton(72, button_y, 24, 16, BUTTON_PLAYBACK_NEXT); + DefineHiddenButton(20, SMBUTTON_Y, 24, 16, BUTTON_PLAYBACK_PREV); + DefineHiddenButton(46, SMBUTTON_Y, 24, 16, BUTTON_PLAYBACK_PLAY_PAUSE); + DefineHiddenButton(72, SMBUTTON_Y, 24, 16, BUTTON_PLAYBACK_NEXT); //Window control buttons DefineHiddenButton(Form.width - 20, 1, 19, 13, BUTTON_WINDOW_CLOSE); DefineHiddenButton(Form.width - 20, 16, 19, 13, BUTTON_WINDOW_REDUCE); diff --git a/programs/cmm/pixie2/pixieskn.png b/programs/cmm/pixie2/pixieskn.png index d7c24ebed2596adc7b7dfbf522bac9d05b05db5c..7fab57cece9ad6384e7dc84c7207411700463884 100644 GIT binary patch delta 1744 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 UO})s9=Kufz07*qoM6N<$g1s%QssI20