这是indexloc提供的服务，不要输入任何密码
Skip to content

Extrakeys lower height,bold arrows,possibly #745. #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Extrakeys lower height,bold arrows,possibly #745. #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae73ce1
feat:lower height,bold arrows,possibly #745
Jul 3, 2018
94216c4
maybe higher
Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/com/termux/app/ExtraKeysView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.termux.app;

import android.content.Context;
import android.graphics.Typeface;
import android.os.Build;
import android.util.AttributeSet;

Expand Down Expand Up @@ -188,6 +189,9 @@ void reload() {
button.setText(buttonText);
button.setTextColor(TEXT_COLOR);
button.setPadding(0, 0, 0, 0);
if("↑←↓→".contains(buttonText)){
button.setTypeface(button.getTypeface(),Typeface.BOLD);
}

final Button finalButton = button;
button.setOnClickListener(new OnClickListener() {
Expand Down Expand Up @@ -271,7 +275,7 @@ public void run() {
LayoutParams param = new GridLayout.LayoutParams();
param.width = 0;
if(Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP){ //special handle api 21
param.height = (int)(37.5 * getResources().getDisplayMetrics().density + 0.5); // 37.5 equal to R.id.viewpager layout_heihgt / rows in DP
param.height = (int)(33 * getResources().getDisplayMetrics().density + 0.5); // 33 equal to R.id.viewpager layout_heihgt / rows in DP
}else{
param.height = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/drawer_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
android:id="@+id/viewpager"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_height="66dp"
android:background="@android:drawable/screen_background_dark_transparent"
android:layout_alignParentBottom="true" />
</RelativeLayout>
4 changes: 2 additions & 2 deletions terminal-view/src/main/java/com/termux/view/TerminalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
}

final int metaState = event.getMetaState();
final boolean controlDownFromEvent = event.isCtrlPressed();
final boolean leftAltDownFromEvent = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0;
final boolean controlDownFromEvent = event.isCtrlPressed() || mClient.readControlKey();
final boolean leftAltDownFromEvent = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;

int keyMod = 0;
Expand Down