forked from KolibriOS/kolibrios
various updates
git-svn-id: svn://kolibrios.org@7784 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
d79ae6398f
commit
06c32b5fc2
@ -44,7 +44,6 @@ _history history;
|
||||
#include "history.h"
|
||||
|
||||
#define PADDING 9
|
||||
#define SKIN_Y 24
|
||||
#define TSZE 25
|
||||
#define STATUSBAR_H 15
|
||||
#define TAB_H 20
|
||||
@ -96,6 +95,8 @@ char editURL[URL_SIZE+1];
|
||||
edit_box address_box = {, PADDING+TSZE*2+PADDING+6, PADDING+3, 0xffffff,
|
||||
0x94AECE, 0xffffff, 0xffffff,0x10000000,URL_SIZE-2,#editURL,0,,19,19};
|
||||
|
||||
char editbox_icons[] = FROM "editbox_icons.raw";
|
||||
|
||||
|
||||
void LoadLibraries()
|
||||
{
|
||||
@ -138,9 +139,7 @@ void main()
|
||||
LoadLibraries();
|
||||
CreateDir("/tmp0/1/Downloads");
|
||||
//CreateDir("/tmp0/1/WebView_Cache");
|
||||
Libimg_LoadImage(#skin, "/sys/toolbar.png");
|
||||
HandleParam();
|
||||
skin.h = 26;
|
||||
WB1.list.SetFont(8, 14, 10011000b);
|
||||
WB1.list.no_selection = true;
|
||||
WB1.custom_encoding = -1;
|
||||
@ -847,7 +846,7 @@ void DrawStatusBar(dword _status_text)
|
||||
|
||||
void DrawOmnibox()
|
||||
{
|
||||
int skin_x_offset;
|
||||
int imgxoff;
|
||||
|
||||
DrawOvalBorder(address_box.left-2, address_box.top-3, address_box.width+18, 24, system.color.work_graph,
|
||||
system.color.work_graph, system.color.work_graph, system.color.work_dark);
|
||||
@ -858,10 +857,9 @@ void DrawOmnibox()
|
||||
if (address_box.flags & ed_focus) address_box.flags = ed_focus; else address_box.flags = 0;
|
||||
EditBox_UpdateText(#address_box, address_box.flags);
|
||||
edit_box_draw stdcall(#address_box);
|
||||
if (http.transfer > 0) skin_x_offset = 85; else skin_x_offset = 68;
|
||||
img_draw stdcall(skin.image, address_box.left+address_box.width+1,
|
||||
address_box.top-1, 16, skin.h-3, skin_x_offset, SKIN_Y+2);
|
||||
DefineHiddenButton(address_box.left+address_box.width-1, address_box.top-2, 17, skin.h-3, REFRESH_BUTTON);
|
||||
if (http.transfer) imgxoff = 16*23*3; else imgxoff = 0;
|
||||
_PutImage(address_box.left+address_box.width+1, address_box.top-1, 16, 23, imgxoff + #editbox_icons);
|
||||
DefineHiddenButton(address_box.left+address_box.width-1, address_box.top-2, 17, 23, REFRESH_BUTTON);
|
||||
|
||||
DrawProgress();
|
||||
}
|
||||
|
BIN
programs/cmm/browser/editbox_icons.png
Normal file
BIN
programs/cmm/browser/editbox_icons.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 998 B |
1
programs/cmm/browser/editbox_icons.raw
Normal file
1
programs/cmm/browser/editbox_icons.raw
Normal file
@ -0,0 +1 @@
|
||||
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフフャャャ血軒ャャフフフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワ血血血血血血血血血血五ワワ<EFBFBD><EFBFBD>フフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワワ血血血フフフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフ血血血フフフ血向<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>血血五ワワ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>血血血血向<EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフフ血故フフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフフ血血血血向<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ャャャ血倖<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフ血血血血血血<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>血ャャャ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ャャャ血倖<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>血血血<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフ血故フフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフ血故フフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>血血血ワワワ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワ血血血<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワ血血血フフフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフ血血血ワワワ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワワ血血血血血血血血血血五ワワ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>フフャャャ血軒ャャフフフ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワワ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\Lヤ<4C><EFBE94><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\Lヤ<4C><EFBE94><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ<4C><EFBE94><EFBFBD>\Lヤ\Lヤ\Lヤ<4C><EFBE94><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ\Lヤ\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ\Lヤ<4C><EFBE94><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ\Lヤ\Lヤ4$、4$、\Lヤ\Lヤ\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Lヤ\Lヤ4$、<><EFBDA4><EFBFBD>4$、\Lヤ4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4$、<><EFBDA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ワワ
|
@ -138,29 +138,43 @@ void ProcessKeys()
|
||||
void draw_list()
|
||||
{
|
||||
int i, item_y;
|
||||
dword name_color;
|
||||
dword hotkey_color;
|
||||
|
||||
dword active_background_color = MixColors(system.color.work_button, system.color.work,230);
|
||||
dword active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240);
|
||||
dword inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,150);
|
||||
dword text_color;
|
||||
bool skin_dark = skin_is_dark();
|
||||
static dword inactive_background_color;
|
||||
static dword active_background_color;
|
||||
static dword active_top_border_color;
|
||||
static dword inactive_text_shadow_color;
|
||||
static bool skin_dark;
|
||||
|
||||
static bool colors_set;
|
||||
if (!colors_set) {
|
||||
colors_set = true;
|
||||
inactive_background_color = MixColors(system.color.work, 0xFFFfff,230);
|
||||
active_background_color = MixColors(system.color.work_button, system.color.work,230);
|
||||
active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240);
|
||||
inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,120);
|
||||
skin_dark = skin_is_dark();
|
||||
}
|
||||
|
||||
for (i=0; i<menu1.count; i++;)
|
||||
{
|
||||
item_y = i*ITEM_H+menu1.y;
|
||||
if (i==menu1.cur_y) {
|
||||
text_color = system.color.work_button_text;
|
||||
hotkey_color = name_color = system.color.work_button_text;
|
||||
DrawBar(menu1.x, item_y+1, menu1.w, ITEM_H-2, active_background_color);
|
||||
DrawBar(menu1.x, item_y, menu1.w, 1, active_top_border_color);
|
||||
DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, system.color.work_light);
|
||||
WriteText(13 + max_name_len, item_y + menu1.text_y, 0x80, text_color, hotkeys.get(i));
|
||||
} else {
|
||||
text_color = system.color.work_text;
|
||||
DrawBar(menu1.x, item_y, menu1.w, ITEM_H, system.color.work);
|
||||
if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80, inactive_text_shadow_color, names.get(i));
|
||||
WriteText(13 + max_name_len, item_y + menu1.text_y, 0x80, system.color.work_graph, hotkeys.get(i));
|
||||
name_color = system.color.work_text;
|
||||
hotkey_color = system.color.work_graph;
|
||||
DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color);
|
||||
if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80,
|
||||
inactive_text_shadow_color, names.get(i));
|
||||
}
|
||||
WriteText(13, item_y + menu1.text_y, 0x80, text_color, names.get(i));
|
||||
WriteText(-strlen(hotkeys.get(i))*6 + 13 + max_name_len + max_hotkey_len,
|
||||
item_y + menu1.text_y, 0x80, hotkey_color, hotkeys.get(i));
|
||||
WriteText(13, item_y + menu1.text_y, 0x80, name_color, names.get(i));
|
||||
}
|
||||
if (selected) WriteText(5, selected-1*ITEM_H + menu1.y + menu1.text_y, 0x80, 0xEE0000, "\x10");
|
||||
}
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 700 B After Width: | Height: | Size: 504 B |
@ -26,8 +26,8 @@
|
||||
//===================================================//
|
||||
|
||||
#define TOOLBAR_H 34
|
||||
#define TOOLBAR_ICON_WIDTH 26
|
||||
#define TOOLBAR_ICON_HEIGHT 24
|
||||
#define TOOLBAR_ICON_WIDTH 24
|
||||
#define TOOLBAR_ICON_HEIGHT 22
|
||||
|
||||
#define DEFAULT_EDITOR "/sys/tinypad"
|
||||
|
||||
@ -415,13 +415,14 @@ void draw_window()
|
||||
incn x;
|
||||
DefineAndDrawWindow(Form.left,Form.top,Form.width,Form.height,0x73,0,#title,0);
|
||||
GetProcessInfo(#Form, SelfInfo);
|
||||
system.color.get();
|
||||
if (Form.status_window>2) return;
|
||||
|
||||
if (Form.width < 200) { MoveSize(OLD,OLD,200,OLD); return; }
|
||||
if (Form.height < 200) { MoveSize(OLD,OLD,OLD,200); return; }
|
||||
|
||||
DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, 0xe1e1e1);
|
||||
DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, 0x7F7F7F);
|
||||
DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, system.color.work);
|
||||
DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, system.color.work_graph);
|
||||
|
||||
x.n = 0;
|
||||
DrawToolbarButton(OPEN_FILE, x.inc(8));
|
||||
@ -456,8 +457,11 @@ void DrawPage()
|
||||
|
||||
void DrawToolbarButton(char image_id, int x)
|
||||
{
|
||||
DefineButton(x+1, 6, TOOLBAR_ICON_WIDTH-2, TOOLBAR_ICON_HEIGHT-2, 10+image_id + BT_HIDE, 0);
|
||||
img_draw stdcall(skin.image, x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH-1*image_id, 0);
|
||||
DefineButton(x+1, 6, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, 10+image_id + BT_HIDE, 0);
|
||||
//img_draw stdcall(skin.image, x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH-1*image_id, 0);
|
||||
DrawOvalBorder(x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, system.color.work_graph,
|
||||
system.color.work_graph,system.color.work_graph, system.color.work_dark);
|
||||
img_draw stdcall(skin.image, x+1, 5+1, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH*image_id, 0);
|
||||
}
|
||||
|
||||
void DrawScroller()
|
||||
|
@ -2173,7 +2173,7 @@ DATA
|
||||
|
||||
s_header db ' - Kolibri Image Viewer',0
|
||||
window_style dd 0x53FFFFFF
|
||||
window BOX 101, 144, 529, 324 ; left top width height
|
||||
window BOX 101, 144, 750, 600 ; left top width height
|
||||
window_prev BOX 0, 0, 0, 0
|
||||
window_save BOX 0, 0, 0, 0 ; restore after slide show
|
||||
client BOX 0, 0, 0, 0
|
||||
|
@ -1,4 +1,4 @@
|
||||
include "..\..\..\macros.inc"
|
||||
include "..\..\..\..\macros.inc"
|
||||
|
||||
initipc:
|
||||
mov eax,9
|
Loading…
Reference in New Issue
Block a user