aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Eolite: fix paste

Browse Source 
WebView: fix space in the end of value
menu: refine params


git-svn-id: svn://kolibrios.org@8020 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2020-06-03 22:21:39 +00:00
parent 83f1ae7375
commit c9389437b7
12 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
programs/cmm/TWB/img.h
View File

@@ -56,19 +56,6 @@ void _img::set_data(dword _data, _data_len)
data.set(getid, _data); data.set(getid, _data);
} }
void DrawLibimgImage(dword _x, _y, _data, _data_len)
{
libimg_image im;
img_decode stdcall (_data, _data_len, 0);
$or eax, eax
$jz __ERROR__
im.image = EAX;
im.set_vars();
im.draw(_x, _y, im.w, im.h, 0, 0);
__ERROR__:
}
void _img::draw(int _x, _y, _start, _height) void _img::draw(int _x, _y, _start, _height)
{ {
int i, img_x, img_y; int i, img_x, img_y;
@@ -86,6 +73,19 @@ void _img::draw(int _x, _y, _start, _height)
} }
} }
void DrawLibimgImage(dword _x, _y, _data, _data_len)
{
libimg_image im;
img_decode stdcall (_data, _data_len, 0);
$or eax, eax
$jz __ERROR__
im.image = EAX;
im.set_vars();
im.draw(_x, _y, im.w, im.h, 0, 0);
__ERROR__:
}
/* /*
void ImageCache::Images(dword left1, top1, width1) void ImageCache::Images(dword left1, top1, width1)

1
programs/cmm/TWB/parse_tag.h
View File

@@ -106,6 +106,7 @@ bool _tag::get_next_param()
ESBYTE[i+1] = '\0'; ESBYTE[i+1] = '\0';
} }
strlwr(#attr); strlwr(#attr);
strrtrim(#val);
attributes.add(#attr); attributes.add(#attr);
values.add(#val); values.add(#val);

2
programs/cmm/appearance/appearance.c
View File

@@ -132,7 +132,7 @@ void main()
select_list.ProcessMouse(mouse.x, mouse.y); select_list.ProcessMouse(mouse.x, mouse.y);
SelectList_Draw(); SelectList_Draw();
EventSetNewCurrent(); EventSetNewCurrent();
open_lmenu(Form.left+mouse.x+5, Form.top+mouse.y+skin_height, 1, 0, MENU_LIST); open_lmenu(mouse.x, mouse.y, MENU_TOP_RIGHT, NULL, MENU_LIST);
} }
break; break;

15
programs/cmm/browser/WebView.c
View File

@@ -32,7 +32,7 @@
#define URL_SIZE 4000 #define URL_SIZE 4000
char version[]="WebView 2.65"; char version[]="WebView 2.65b";
#include "texts.h" #include "texts.h"
#include "cache.h" #include "cache.h"
@@ -789,27 +789,28 @@ void DrawProgress()
void EventShowPageMenu() void EventShowPageMenu()
{ {
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu); open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu);
menu_id = VIEW_SOURCE; menu_id = VIEW_SOURCE;
} }
void EventShowLinkMenu() void EventShowLinkMenu()
{ {
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #link_menu); open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #link_menu);
menu_id = IN_NEW_TAB; menu_id = IN_NEW_TAB;
} }
void EventShowMainMenu() void EventShowMainMenu()
{ {
open_lmenu(Form.left + Form.cwidth - PADDING, Form.top + skin_height + PADDING + TSZE + 3, open_lmenu(Form.cwidth - PADDING -4, PADDING + TSZE + 3,
MENU_ALIGN_TOP_RIGHT, NULL, #main_menu); MENU_TOP_RIGHT, NULL, #main_menu);
menu_id = OPEN_FILE; menu_id = OPEN_FILE;
} }
void EventShowEncodingsList() void EventShowEncodingsList()
{ {
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + Form.cheight - STATUSBAR_H + 12, open_lmenu(Form.cwidth-4, Form.cheight - STATUSBAR_H + 12,
MENU_ALIGN_BOT_RIGHT, WB1.cur_encoding + 1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866"); MENU_BOT_RIGHT, WB1.cur_encoding + 1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866");
menu_id = ENCODINGS; menu_id = ENCODINGS;
} }

7
programs/cmm/eolite/Eolite.c
View File

@@ -3,8 +3,8 @@
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define TITLE "Eolite File Manager 4.46c" #define TITLE "Eolite File Manager 4.46d"
#define ABOUT_TITLE "EOLITE 4.46c" #define ABOUT_TITLE "EOLITE 4.46d"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"
@@ -172,17 +172,20 @@ void handle_param()
param[strrchr(#param, '/')-1] = '\0'; param[strrchr(#param, '/')-1] = '\0';
strcpy(#path, #param + 3); strcpy(#path, #param + 3);
properties_dialog(); properties_dialog();
ExitProcess();
return; return;
case 'd': case 'd':
strcpy(#file_path, #param + 3); strcpy(#file_path, #param + 3);
itdir = dir_exists(#file_path); itdir = dir_exists(#file_path);
DisplayOperationForm(DELETE_FLAG); DisplayOperationForm(DELETE_FLAG);
DeleteSingleElement(); DeleteSingleElement();
ExitProcess();
return; return;
case 'v': case 'v':
cut_active = param[2] - '0'; cut_active = param[2] - '0';
strcpy(#path, #param + 4); strcpy(#path, #param + 4);
PasteThread(); PasteThread();
ExitProcess();
return; return;
} }
} }

6
programs/cmm/eolite/include/menu.h
View File

@@ -140,15 +140,13 @@ void EventShowListMenu()
text = #file_actions; text = #file_actions;
active_menu = MENU_FILE; active_menu = MENU_FILE;
} }
open_lmenu(mouse.x+Form.left+5, mouse.y+Form.top+3 open_lmenu(mouse.x, mouse.y+3, MENU_TOP_LEFT, NULL, text);
+skin_height, MENU_ALIGN_TOP_LEFT, NULL, text);
} }
void EventShowBurgerMenu() void EventShowBurgerMenu()
{ {
active_menu = MENU_BURGER; active_menu = MENU_BURGER;
open_lmenu(Form.width-10+Form.left, 35+Form.top+skin_height, open_lmenu(Form.cwidth-6, 35, MENU_TOP_RIGHT, NULL, #burger_menu_items);
MENU_ALIGN_TOP_RIGHT, NULL, #burger_menu_items);
} }
bool GetMenuClick() bool GetMenuClick()

8
programs/cmm/examples/menu.c
View File

@@ -44,13 +44,13 @@ void main()
if (id==1) ExitProcess(); if (id==1) ExitProcess();
if (id==butv.id) { if (id==butv.id) {
menu_id = butv.id; menu_id = butv.id;
open_lmenu(Form.left+3 + butv.x, Form.top+skin_height + butv.y + butv.h, open_lmenu(butv.x, butv.y + butv.h, MENU_TOP_LEFT,
MENU_ALIGN_TOP_LEFT, current_veg, #vegetables); current_veg, #vegetables);
} }
if (id==buta.id) { if (id==buta.id) {
menu_id = buta.id; menu_id = buta.id;
open_lmenu(Form.left+5 + buta.x + buta.w, Form.top+skin_height + buta.y + buta.h, open_lmenu(buta.x + buta.w, buta.y + buta.h,
MENU_ALIGN_TOP_RIGHT, current_animal, #animals); MENU_TOP_RIGHT, current_animal, #animals);
} }
break; break;

8
programs/cmm/iconedit/iconedit.c
View File

@@ -743,14 +743,14 @@ void EventCrop()
void EventShowImageMenu() void EventShowImageMenu()
{ {
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #image_menu_items); MENU_TOP_LEFT, NULL, #image_menu_items);
} }
void EventShowEditMenu() void EventShowEditMenu()
{ {
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height + open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #edit_menu_items); MENU_TOP_LEFT, NULL, #edit_menu_items);
} }
void EventCheckMenuItemSelected() void EventCheckMenuItemSelected()

12
programs/cmm/lib/gui/menu.h
View File

@@ -3,10 +3,10 @@
:dword menu_process_id; :dword menu_process_id;
#define MENU_ALIGN_TOP_LEFT 0 #define MENU_TOP_LEFT 0
#define MENU_ALIGN_TOP_RIGHT 1 #define MENU_TOP_RIGHT 1
#define MENU_ALIGN_BOT_LEFT 2 #define MENU_BOT_LEFT 2
#define MENU_ALIGN_BOT_RIGHT 3 #define MENU_BOT_RIGHT 3
:dword shared_mem = NULL; :dword shared_mem = NULL;
:char shared_name[] = "LMENU"; :char shared_name[] = "LMENU";
@@ -17,8 +17,8 @@
if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE); if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE);
} }
ESDWORD[shared_mem ] = _selected; ESDWORD[shared_mem ] = _selected;
ESDWORD[shared_mem + 4] = _x; ESDWORD[shared_mem + 4] = _x + Form.left + 5;
ESDWORD[shared_mem + 8] = _y; ESDWORD[shared_mem + 8] = _y + Form.top + skin_height;
ESDWORD[shared_mem + 12] = _position; ESDWORD[shared_mem + 12] = _position;
menu_process_id = RunProgram("/sys/develop/menu", _text1); menu_process_id = RunProgram("/sys/develop/menu", _text1);
} }

4
programs/cmm/misc/calypte.c
View File

@@ -437,8 +437,8 @@ void EventMenuClick()
void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected) void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
{ {
open_lmenu(Form.left+5 + _menu_item_x, Form.top+skin_height + TOPPANELH, open_lmenu(_menu_item_x, TOPPANELH, MENU_TOP_LEFT,
MENU_ALIGN_TOP_LEFT, _selected, _menu_list); _selected, _menu_list);
menu_id = _id; menu_id = _id;
} }

13
programs/cmm/quark/quark.c
View File

@@ -379,32 +379,29 @@ void EventMagnifyPlus()
void EventShowCharsetsList() void EventShowCharsetsList()
{ {
menu_id = CHANGE_CHARSET; menu_id = CHANGE_CHARSET;
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height open_lmenu(Form.cwidth-4, Form.cheight - 6, MENU_BOT_RIGHT,
+ Form.cheight - 6, MENU_ALIGN_BOT_RIGHT, user_encoding+1, user_encoding+1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO"); "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO");
} }
void EventShowReopenMenu() void EventShowReopenMenu()
{ {
menu_id = REOPEN_IN_APP; menu_id = REOPEN_IN_APP;
open_lmenu(Form.left+5 + reopenin_mx + 23, Form.top+29+skin_height, open_lmenu(reopenin_mx + 23, 29, MENU_TOP_RIGHT, NULL,
MENU_ALIGN_TOP_RIGHT, NULL,
"Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther"); "Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther");
} }
void EventShowThemesList() void EventShowThemesList()
{ {
menu_id = COLOR_SCHEME; menu_id = COLOR_SCHEME;
open_lmenu(Form.left+5 + theme_mx + 23, open_lmenu(theme_mx + 23, 29, MENU_TOP_RIGHT,
Form.top+29+skin_height, MENU_ALIGN_TOP_RIGHT,
curcol_scheme+1, #color_scheme_names); curcol_scheme+1, #color_scheme_names);
} }
void EventShowRmbMenu() void EventShowRmbMenu()
{ {
menu_id = RMB_MENU; menu_id = RMB_MENU;
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu);
MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu);
} }