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

#WebView: [fix] do not pop the default text color

Browse Source 
#uARM: host image at store.kolibri-n.org [as xvilka's server doesn't work]
#Eolite: finally fix one of the oldest issues with KeyUp at the top of the list, which could move selection on the random file
#KolibriNext installer: activate window after installation


git-svn-id: svn://kolibrios.org@9341 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-11-27 23:03:47 +00:00
parent f90d41a388
commit 3717b92b6d
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/common/emul/uarm/download_image.sh
View File

@ -1,2 +1,2 @@
#SHS #SHS
/sys/network/dl http://xvilka.me/jaunty.rel.v2.bz2 /sys/network/dl http://store.kolibri-n.org/other/jaunty.rel.v2.bz2

2
programs/cmm/browser/TWB/set_style.h
View File

@ -87,7 +87,7 @@ void TWebBrowser::tag_font()
} }
} }
else { else {
text_colors.pop(); if (bg_colors.count>1) text_colors.pop();
if (bg_colors.count>1) bg_colors.pop(); //never pop the last color if (bg_colors.count>1) bg_colors.pop(); //never pop the last color
} }
} }

2
programs/cmm/browser/const.h
View File

@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw";
#define DEFAULT_URL "/sys/fonts/ru.htm" #define DEFAULT_URL "/sys/fonts/ru.htm"
char version[]="WebView 3.66"; char version[]="WebView 3.66-1";

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

@ -9,9 +9,9 @@ TODO:
http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334 http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
*/ */
#define ABOUT_TITLE "EOLITE 5.1" #define ABOUT_TITLE "EOLITE 5.11"
#define TITLE_EOLITE "Eolite File Manager 5.1" #define TITLE_EOLITE "Eolite File Manager 5.11"
#define TITLE_KFM "Kolibri File Manager 2.1"; #define TITLE_KFM "Kolibri File Manager 2.11";
#define MEMSIZE 1024 * 250 #define MEMSIZE 1024 * 250
#include "../lib/clipboard.h" #include "../lib/clipboard.h"
@ -383,25 +383,18 @@ void main()
break; break;
} }
if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) { if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT)
{
if (key_scancode == SCAN_CODE_ENTER) { if (key_scancode == SCAN_CODE_ENTER) {
EventOpenSelected(); EventOpenSelected();
break; break;
} }
old_cur_y = files.cur_y; old_cur_y = files.cur_y;
files.ProcessKey(key_scancode); files.ProcessKey(key_scancode);
EventChooseFilesRange(old_cur_y, files.cur_y); EventChooseFilesRange(old_cur_y, files.cur_y);
break; break;
} }
if (files.ProcessKey(key_scancode))
{
List_ReDraw();
break;
}
if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL) if (key_modifier&KEY_LCTRL) || (key_modifier&KEY_RCTRL)
{ {
switch(key_scancode) switch(key_scancode)
@ -460,7 +453,6 @@ void main()
} }
break; break;
} }
switch (key_scancode) switch (key_scancode)
{ {
case SCAN_CODE_BS: case SCAN_CODE_BS:
@ -495,6 +487,14 @@ void main()
case SCAN_CODE_F1...SCAN_CODE_F10: case SCAN_CODE_F1...SCAN_CODE_F10:
FnProcess(key_scancode-58); FnProcess(key_scancode-58);
break; break;
case SCAN_CODE_DOWN:
case SCAN_CODE_UP:
case SCAN_CODE_HOME:
case SCAN_CODE_END:
case SCAN_CODE_PGUP:
case SCAN_CODE_PGDN:
if (files.ProcessKey(key_scancode)) List_ReDraw();
break;
default: default:
EventSelectFileByKeyPress(); EventSelectFileByKeyPress();
} }

11
programs/cmm/misc/install.c
View File

@ -121,7 +121,16 @@ void EventInstall()
RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/Free yourself.jpg"); RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/Free yourself.jpg");
install_complete = true; install_complete = true;
draw_window();
pause(150);
ActivateWindow_Self();
}
void ActivateWindow_Self()
{
proc_info Form;
GetProcessInfo(#Form, SelfInfo);
ActivateWindow(GetProcessSlot(Form.ID));
} }
void Operation_Draw_Progress(dword filename) { } void Operation_Draw_Progress(dword filename) { }