Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Gui: Fix Keyboard binding screen

Browse Source
This commit is contained in:
gnosygnu 2017-02-15 04:55:45 -05:00
parent 140351c2ed
commit faebc72c4f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
150_gfui/src/gplx/gfui/kits/swts/Swt_btn_no_border.java
View File

@ -43,7 +43,7 @@ public class Swt_btn_no_border implements GxwElem, Swt_control {
public Swt_btn_no_border(Swt_control owner_control, Keyval_hash ctorArgs) {
Composite owner = owner_control.Under_composite();
Make_btn_no_border(owner.getDisplay(), owner.getShell(), owner);
this.core = new Swt_core__basic(box_btn);
this.core = new Swt_core__dual(box_grp, box_btn, 2, 2);
box_btn.addKeyListener(new Swt_lnr_key(this));
box_btn.addMouseListener(new Swt_lnr_mouse(this));
box_btn.setCursor((Cursor)ctorArgs.Get_val_or_null("cursor"));
@ -52,7 +52,7 @@ public class Swt_btn_no_border implements GxwElem, Swt_control {
@Override public Composite Under_composite() {return box_grp;}
@Override public Control Under_menu_control() {return box_grp;}
@Override public String TextVal() {return box_btn.getText();} @Override public void TextVal_set(String v) {box_btn.setText(v);}
@Override public GxwCore_base Core() {return core;} private final Swt_core__basic core;
@Override public GxwCore_base Core() {return core;} private final Swt_core__base core;
@Override public GxwCbkHost Host() {return host;} @Override public void Host_set(GxwCbkHost host) {this.host = host;} private GxwCbkHost host;
@Override public void EnableDoubleBuffering() {}
@Override public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
@ -63,8 +63,7 @@ public class Swt_btn_no_border implements GxwElem, Swt_control {
private void Btn_img_(ImageAdp v) {
if (box_btn == null || v == null) return;
SizeAdp size = core.Size();
int dif = 0;
box_btn.setImage((Image)v.Resize(size.Width() - dif, size.Height() - dif).Under());
box_btn.setImage((Image)v.Resize(size.Width(), size.Height()).Under());
}
private void Make_btn_no_border(Display display, Shell shell, Composite owner) {
box_grp = new Composite(owner, SWT.FLAT);
@ -72,7 +71,7 @@ public class Swt_btn_no_border implements GxwElem, Swt_control {
box_grp.setSize(16, 16);
box_btn.setSize(16, 16);
box_grp.setBackground(display.getSystemColor(SWT.COLOR_WHITE));
box_btn.setBackground(display.getSystemColor(SWT.COLOR_RED));
box_btn.setBackground(display.getSystemColor(SWT.COLOR_WHITE));
box_btn.addFocusListener(new Swt_clabel_lnr_focus(box_grp));
}
}

6
400_xowa/src/gplx/xowa/apps/apis/xowa/gui/browsers/Xoapi_url.java
View File

@ -24,7 +24,11 @@ public class Xoapi_url implements Gfo_invk {
this.app = app;
}
private GfuiComboBox Url_box() {return app.Gui_mgr().Browser_win().Url_box();}
public void Focus() {this.Url_box().Focus(); this.Url_box().Sel_(0, String_.Len(this.Url_box().Text()));}
public void Focus() {
GfuiComboBox url_box = this.Url_box();
url_box.Focus();
url_box.Sel_(0, String_.Len(this.Url_box().Text()));
}
public void Exec() {Exec_wkr(Bool_.N, this.Url_box().Text());}
public void Exec_by_paste() {Exec_wkr(Bool_.N, ClipboardAdp_.GetText());}
public void Exec_new_tab_by_paste() {Exec_wkr(Bool_.Y, ClipboardAdp_.GetText());}

2
400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java
View File

@ -270,7 +270,7 @@ public class Xog_bnd_mgr implements Gfo_invk {
Init_itm(Xog_cmd_itm_.Key_gui_browser_url_exec , Xog_bnd_box_.Tid_browser_url , "key.enter");
Init_itm(Xog_cmd_itm_.Key_gui_browser_url_exec_new_tab_by_paste , Xog_bnd_box_.Tid_browser_url , "mod.c+key.enter");
Init_itm(Xog_cmd_itm_.Key_gui_browser_url_exec_by_paste , Xog_bnd_box_.Tid_browser_url , "mouse.middle", "mod.a+key.enter");
Init_itm(Xog_cmd_itm_.Key_gui_browser_url_restore , Xog_bnd_box_.Tid_browser_url , "mod.c+key.u");
Init_itm(Xog_cmd_itm_.Key_gui_browser_url_restore , Xog_bnd_box_.Tid_browser_url , "key.escape");
Init_itm(Xog_cmd_itm_.Key_gui_browser_search_focus , Xog_bnd_box_.Tid_browser , "mod.ca+key.s");
Init_itm(Xog_cmd_itm_.Key_gui_browser_search_exec , Xog_bnd_box_.Tid_browser_search , "key.enter");
Init_itm(Xog_cmd_itm_.Key_gui_browser_tabs_new_dflt__at_dflt__focus_y , Xog_bnd_box_.Tid_browser , "mod.c+key.t");

2
400_xowa/src/gplx/xowa/guis/views/Xog_win_itm.java
View File

@ -306,7 +306,7 @@ public class Xog_win_itm implements Gfo_invk, Gfo_evt_itm {
search_box = Xog_win_itm_.new_txt(app, kit, toolbar_grp, ui_font, "search_box" , true);
search_exec_btn = Xog_win_itm_.new_btn(app, kit, toolbar_grp, img_dir, "search_exec_btn", "search_exec.png" );
url_box.Layout_data_(new Swt_layout_data__grid().Grab_excess_w_(true).Align_w__fill_().Min_w_(100));
search_box.Layout_data_(new Swt_layout_data__grid().Hint_w_(10));
search_box.Layout_data_(new Swt_layout_data__grid().Hint_w_(160));
tab_mgr.Init_by_kit(kit);
tab_mgr.Tab_mgr().Layout_data_(new Swt_layout_data__grid().Grab_excess_h_(true).Align_w__fill_().Align_h__fill_().Grab_excess_w_(true));