diff --git a/programs/media/Fplay/FPlay-UI.psd b/programs/media/Fplay/FPlay-UI.psd index 8ecd7f0733..04fb512380 100644 Binary files a/programs/media/Fplay/FPlay-UI.psd and b/programs/media/Fplay/FPlay-UI.psd differ diff --git a/programs/media/Fplay/winlib/caption.c b/programs/media/Fplay/winlib/caption.c index 0837184eeb..53dfd9eceb 100644 --- a/programs/media/Fplay/winlib/caption.c +++ b/programs/media/Fplay/winlib/caption.c @@ -19,6 +19,10 @@ extern int res_minimize_btn[]; extern int res_minimize_btn_hl[]; extern int res_minimize_btn_pressed[]; +extern int res_full_btn[]; +extern int res_full_btn_hl[]; +extern int res_full_btn_pressed[]; + extern uint32_t main_cursor; void update_caption_size(window_t *win); @@ -59,20 +63,27 @@ int init_caption(window_t *win) cpt->ctrl.ctx = ctx; - btn = create_button(NULL, ID_CLOSE,0,5,16,18,(ctrl_t*)cpt); + btn = create_button(NULL, ID_CLOSE,0,5,18,18,(ctrl_t*)cpt); cpt->close_btn = btn; btn->img_default = res_close_btn; btn->img_hilite = res_close_btn_hl; btn->img_pressed = res_close_btn_pressed; - btn = create_button(NULL, ID_MINIMIZE,0,5,16,18,(ctrl_t*)cpt); + btn = create_button(NULL, ID_MINIMIZE,0,5,18,18,(ctrl_t*)cpt); cpt->minimize_btn = btn; btn->img_default = res_minimize_btn; btn->img_hilite = res_minimize_btn_hl; btn->img_pressed = res_minimize_btn_pressed; + btn = create_button(NULL, ID_FULL,0,5,18,18,(ctrl_t*)cpt); + cpt->full_btn = btn; + + btn->img_default = res_full_btn; + btn->img_hilite = res_full_btn_hl; + btn->img_pressed = res_full_btn_pressed; + update_caption_size(win); return 1; @@ -110,14 +121,18 @@ void update_caption_size(window_t *win) cpt->ctrl.h = CAPTION_HEIGHT; win->client.t = CAPTION_HEIGHT; - cpt->close_btn->ctrl.rc.l = win->w - 25; + cpt->close_btn->ctrl.rc.l = win->w - 27; cpt->close_btn->ctrl.rc.r = cpt->close_btn->ctrl.rc.l + cpt->close_btn->ctrl.w; - cpt->minimize_btn->ctrl.rc.l = win->w - 25 - 16 - 5; + cpt->minimize_btn->ctrl.rc.l = win->w - 27 - 18 - 5; cpt->minimize_btn->ctrl.rc.r = cpt->minimize_btn->ctrl.rc.l + cpt->minimize_btn->ctrl.w; + cpt->full_btn->ctrl.rc.l = win->w - 27 - 18 -18 - 5 - 5; + cpt->full_btn->ctrl.rc.r = cpt->full_btn->ctrl.rc.l + + cpt->full_btn->ctrl.w; + }; @@ -157,7 +172,7 @@ void draw_caption(caption_t *cpt) rc.l = 8; rc.t = 0; - rc.r = cpt->ctrl.w - 25 - 16 - 5 - 8; + rc.r = cpt->ctrl.w - 27 - 18 - 18 - 5 - 5 - 8; rc.b = 18; draw_text_ext(cpt->ctx.pixmap, win_font, cpt->text, &rc, 0xFFFFFFFF); diff --git a/programs/media/Fplay/winlib/clbhl.raw b/programs/media/Fplay/winlib/clbhl.raw index 0e9e1db8e9..401d6543ed 100644 Binary files a/programs/media/Fplay/winlib/clbhl.raw and b/programs/media/Fplay/winlib/clbhl.raw differ diff --git a/programs/media/Fplay/winlib/clbn.raw b/programs/media/Fplay/winlib/clbn.raw index c5d00a7794..56f811500e 100644 Binary files a/programs/media/Fplay/winlib/clbn.raw and b/programs/media/Fplay/winlib/clbn.raw differ diff --git a/programs/media/Fplay/winlib/clbp.raw b/programs/media/Fplay/winlib/clbp.raw index 92d0ad38eb..b71cf5a924 100644 Binary files a/programs/media/Fplay/winlib/clbp.raw and b/programs/media/Fplay/winlib/clbp.raw differ diff --git a/programs/media/Fplay/winlib/close_button.raw b/programs/media/Fplay/winlib/close_button.raw deleted file mode 100644 index 8c5e7977ec..0000000000 --- a/programs/media/Fplay/winlib/close_button.raw +++ /dev/null @@ -1 +0,0 @@ -okhokhokhokhniflgdjebhc_hb_hc_jeblgdnifokhokhokhokhlhdlhdlhdidafa]d_[d_[d_[d_[d_[d_[d_[fa]idalhdlhdlhdhdahdae`\a[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[We`\hdahdae`]b]Y]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WSb]Ye`]`[X[UQZTPZTPZTPZTPZTPZTPZTPZTPZTP[UQ`[X[VRVPLVPLVPLVPLVPLVPLVPLVPLVPL[VRUOLRLHRLHRLHRLHRLHRLHRLHRLHRLHUOLPJFOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEPJF70+70+70+70+70+70+70+70+70+70+70+70+70+70+81,70+70+70+70+70+70+70+70+70+70+81,:3/70+70+70+70+70+70+70+70+70+:3/=6270+70+70+70+70+70+70+70+70+=62?9592-70+70+70+70+70+70+70+70+70+92-?95A;7=7270+70+70+70+70+70+70+70+70+70+70+70+70+=72A;7A;7A;7<6170+70+70+70+70+70+70+70+70+70+70+<61A;7A;7A;7A;7A;7=7292-70+70+70+70+70+70+70+92-=72A;7A;7A;7A;7A;7A;7A;7?95=62:3/81,70+81,:3/=62?95A;7A;7A;7A;7 \ No newline at end of file diff --git a/programs/media/Fplay/winlib/close_button_pressed.raw b/programs/media/Fplay/winlib/close_button_pressed.raw deleted file mode 100644 index 621a6cce6b..0000000000 --- a/programs/media/Fplay/winlib/close_button_pressed.raw +++ /dev/null @@ -1 +0,0 @@ -okhokhokhokhniflgdjebhc_hb_hc_jeblgdnifokhokhokhokhlhdlhdlhdidafa]d_[d_[d_[d_[d_[d_[d_[fa]idalhdlhdlhdhdahdae`\a[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[We`\hdahdae`]b]Y]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WSb]Ye`]`[X[UQZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTP[UQ`[X[VRVPLVPLVPLVPLXSOVPLXSOVPLVPLVPLVPL[VRUOLRLHRLHRLHRLHWQLRLHRLHRLHRLHUOLPJFOIEOIEOIEOIEUNJUNJOIEOIEOIEOIEPJF70+70+70+70+70+70+?83?8370+70+70+70+70+70+81,70+70+70+70+=61~z~z=6170+70+70+70+81,:3/70+70+70+70+~{w|<50|~{w70+70+70+70+:3/=6270+70+70+70+~{w93.70+93.~{w70+70+70+70+=62?9592-70+70+70+70+70+70+70+70+70+70+70+70+70+92-?95A;7=7270+70+70+70+70+70+70+70+70+70+70+70+70+=72A;7A;7A;7<6170+70+70+70+70+70+70+70+70+70+70+<61A;7A;7A;7A;7A;7=7292-70+70+70+70+70+70+70+92-=72A;7A;7A;7A;7A;7A;7A;7?95=62:3/81,70+81,:3/=62?95A;7A;7A;7A;7 \ No newline at end of file diff --git a/programs/media/Fplay/winlib/fullbhl.raw b/programs/media/Fplay/winlib/fullbhl.raw new file mode 100644 index 0000000000..5f307a58a5 --- /dev/null +++ b/programs/media/Fplay/winlib/fullbhl.raw @@ -0,0 +1,10 @@ + + +       GFBaa[cb\fe\gf]hg]ih]ji]ji]ih]ih]hg]fe\dd\bb\GGA + GGA;:1>=2B@3CB3EC3GF4HF4HF4GF4GE4DC3BA3@?2?>4ED= + + @?7:9-97(/.20537496968564311/0/=5  ?>498*PL#}u><,>=1>=098'lf$2222222222ĸ)><)><.;:-75#ke"Ÿ)EB&FC&IF&KG'KG'JG'HE&FC&pi#ĸ);9%<;+<;-75"kd!Ź)DA%FC%HE%IF&IF&HE%FC%EB%oh#ĸ);9%<;+:9+53 jd Ÿ)A>#B?#EB#FC#GC$FC#DA#A>#nh"ĸ(97#:9)97*31hb ĸ)?"?;>;=:<9:8icö(3164%10$+)b]µ',*-+/-0-0-/-.,,*b[¶(/-21# .-"&%b\.""""""""&÷**(.,  + ((! 30`[`[`[b\b]b]b\a[`[`[QM%#(' %$!" #!$"%#%#%#$"#!"  $# +!! #"%$%$&%'&'&(''&&%%$%$$#!    + +                 \ No newline at end of file diff --git a/programs/media/Fplay/winlib/fullbn.raw b/programs/media/Fplay/winlib/fullbn.raw new file mode 100644 index 0000000000..4012d94299 Binary files /dev/null and b/programs/media/Fplay/winlib/fullbn.raw differ diff --git a/programs/media/Fplay/winlib/fullbp.raw b/programs/media/Fplay/winlib/fullbp.raw new file mode 100644 index 0000000000..474e73571c --- /dev/null +++ b/programs/media/Fplay/winlib/fullbp.raw @@ -0,0 +1,10 @@ + + +       + ! #!%#&%'&'&&%%$$""  "!#!&%(&*(-+.,.,-+,*)''&%#! %$ + + +*!&%('&$)&+)-+/-/-.,,*)'(%&$('.-# 1/$*(FB{s-+21$32%.,e_2222222222÷(0.64%43%/-f`ĸ(=:?<B?D@D@C?A>>;keķ(1/75%53%/.g`Ÿ(=:?<B?C?C?B?@=>;keķ(2075%53%/.g`ĸ(<9=:@=A>B?A>?<<9kdķ(2075%43%/-e_ĸ(:8;9>;?<?<>;=::8jdķ(1/75%32%-+d^÷(8596;9<9<9;9:896hbö(/.64%10$+)b]µ',*-+/-0-0-/-.,,*b[¶(-+43% /.#'&b].########&÷*)(1/# + ++"$"53b\b] b] d^ e_ e_ d^ c] b] b] SO%$-,#*)" $"%$&%'&(')()()((''&&%%#"!**" &% %$(')(*)+*,+,+-,,++**))(('&%'&! +  + +                    \ No newline at end of file diff --git a/programs/media/Fplay/winlib/minbhl.raw b/programs/media/Fplay/winlib/minbhl.raw index f4b5e42c37..4d5ab14c9a 100644 Binary files a/programs/media/Fplay/winlib/minbhl.raw and b/programs/media/Fplay/winlib/minbhl.raw differ diff --git a/programs/media/Fplay/winlib/minbn.raw b/programs/media/Fplay/winlib/minbn.raw index c7518434c4..ee0f228c6f 100644 Binary files a/programs/media/Fplay/winlib/minbn.raw and b/programs/media/Fplay/winlib/minbn.raw differ diff --git a/programs/media/Fplay/winlib/minbp.raw b/programs/media/Fplay/winlib/minbp.raw index ee4a7ee8be..bab21b1227 100644 Binary files a/programs/media/Fplay/winlib/minbp.raw and b/programs/media/Fplay/winlib/minbp.raw differ diff --git a/programs/media/Fplay/winlib/minimize_btn.raw b/programs/media/Fplay/winlib/minimize_btn.raw deleted file mode 100644 index 1ae3710801..0000000000 --- a/programs/media/Fplay/winlib/minimize_btn.raw +++ /dev/null @@ -1 +0,0 @@ -okhokhokhokhniflgdjebhc_hb_hc_jeblgdnifokhokhokhokhlhdlhdlhdidafa]d_[d_[d_[d_[d_[d_[d_[fa]idalhdlhdlhdhdahdae`\a[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[We`\hdahdae`]b]Y]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WSb]Ye`]`[X[UQZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTP[UQ`[X[VRVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPL[VRUOLRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHUOLPJFOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEPJF70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+81,70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+81,:3/70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+:3/=6270+70+70+70+70+70+70+70+70+70+70+70+70+70+70+=62?9592-70+70+70+70+92-?95A;7=7270+70+70+70+=72A;7A;7A;7<6170+70+70+70+70+70+70+70+70+70+70+<61A;7A;7A;7A;7A;7=7292-70+70+70+70+70+70+70+92-=72A;7A;7A;7A;7A;7A;7A;7?95=62:3/81,70+81,:3/=62?95A;7A;7A;7A;7 \ No newline at end of file diff --git a/programs/media/Fplay/winlib/minimize_btn_pressed.raw b/programs/media/Fplay/winlib/minimize_btn_pressed.raw deleted file mode 100644 index b506725150..0000000000 --- a/programs/media/Fplay/winlib/minimize_btn_pressed.raw +++ /dev/null @@ -1 +0,0 @@ -okhokhokhokhniflgdjebhc_hb_hc_jeblgdnifokhokhokhokhlhdlhdlhdidafa]d_[d_[d_[d_[d_[d_[d_[fa]idalhdlhdlhdhdahdae`\a[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[Wa[We`\hdahdae`]b]Y]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WS]WSb]Ye`]`[X[UQZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTPZTP[UQ`[X[VRVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPLVPL[VRUOLRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHRLHUOLPJFOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEOIEPJF70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+81,70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+81,:3/70+70+70+70+70+70+70+70+70+70+70+70+70+70+70+:3/=6270+70+70+70+70+70+70+70+70+70+70+70+70+70+70+=62?9592-70+70+70+70+70+70+70+70+70+70+70+70+70+92-?95A;7=7270+70+70+70+70+70+=72A;7A;7A;7<6170+70+70+70+70+70+70+70+70+70+70+<61A;7A;7A;7A;7A;7=7292-70+70+70+70+70+70+70+92-=72A;7A;7A;7A;7A;7A;7A;7?95=62:3/81,70+81,:3/=62?95A;7A;7A;7A;7 \ No newline at end of file diff --git a/programs/media/Fplay/winlib/res2.asm b/programs/media/Fplay/winlib/res2.asm index f6ba1f47e6..141ab669a3 100644 --- a/programs/media/Fplay/winlib/res2.asm +++ b/programs/media/Fplay/winlib/res2.asm @@ -12,12 +12,17 @@ public _res_panel_body public _res_border_left public _res_border_right -public _res_close_btn -public _res_close_btn_hl -public _res_close_btn_pressed + +public _res_full_btn +public _res_full_btn_hl +public _res_full_btn_pressed public _res_minimize_btn public _res_minimize_btn_hl public _res_minimize_btn_pressed +public _res_close_btn +public _res_close_btn_hl +public _res_close_btn_pressed + public _res_play_btn public _res_play_btn_pressed @@ -47,33 +52,39 @@ public _res_def_font section '.rdata' data readable align 16 -_res_caption_left: file 'cptleft.raw' -_res_caption_right: file 'cptright.raw' -_res_caption_body: file 'cptbody.raw' +_res_caption_left: file 'cptleft.raw' +_res_caption_right: file 'cptright.raw' +_res_caption_body: file 'cptbody.raw' -_res_panel_left: file 'panelleft.raw' -_res_panel_right: file 'panelright.raw' -_res_panel_body: file 'panel.raw' +_res_panel_left: file 'panelleft.raw' +_res_panel_right: file 'panelright.raw' +_res_panel_body: file 'panel.raw' -_res_border_left: file 'lborder.raw' -_res_border_right: file 'rborder.raw' +_res_border_left: file 'lborder.raw' +_res_border_right: file 'rborder.raw' -_res_close_btn: file 'clbn.raw' -_res_close_btn_hl: file 'clbhl.raw' -_res_close_btn_pressed: file 'clbp.raw' +_res_full_btn: file 'fullbn.raw' +_res_full_btn_hl: file 'fullbhl.raw' +_res_full_btn_pressed: file 'fullbp.raw' -_res_play_btn: file 'playbtn.raw' -_res_play_btn_pressed: file 'playbp.raw' -_res_pause_btn: file 'pausebtn.raw' -_res_pause_btn_pressed: file 'pausebp.raw' +_res_minimize_btn: file 'minbn.raw' +_res_minimize_btn_hl: file 'minbhl.raw' +_res_minimize_btn_pressed: file 'minbp.raw' -_res_stop_btn: file 'stopbtn.raw' -_res_stop_btn_pressed: file 'stopbtnp.raw' +_res_close_btn: file 'clbn.raw' +_res_close_btn_hl: file 'clbhl.raw' +_res_close_btn_pressed: file 'clbp.raw' + + +_res_play_btn: file 'playbtn.raw' +_res_play_btn_pressed: file 'playbp.raw' +_res_pause_btn: file 'pausebtn.raw' +_res_pause_btn_pressed: file 'pausebp.raw' + +_res_stop_btn: file 'stopbtn.raw' +_res_stop_btn_pressed: file 'stopbtnp.raw' -_res_minimize_btn: file 'minbn.raw' -_res_minimize_btn_hl: file 'minbhl.raw' -_res_minimize_btn_pressed: file 'minbp.raw' _res_cursor_ns: file 'size_ns.cur' _res_cursor_we: file 'size_we.cur'