diff --git a/apps/shared/interactive_curve_view_range.cpp b/apps/shared/interactive_curve_view_range.cpp
index 7e5f9680d..2db5afaa2 100644
--- a/apps/shared/interactive_curve_view_range.cpp
+++ b/apps/shared/interactive_curve_view_range.cpp
@@ -131,9 +131,9 @@ void InteractiveCurveViewRange::setDefault() {
return;
}
if (!m_delegate->defautRangeIsNormalized()) {
+ m_yAuto = true;
m_xRange.setMax(m_delegate->interestingXHalfRange(), k_lowerMaxFloat, k_upperMaxFloat);
setXMin(-xMax());
- m_yAuto = true;
return;
}
diff --git a/apps/statistics/histogram_controller.cpp b/apps/statistics/histogram_controller.cpp
index 1f153855a..a3ad6decd 100644
--- a/apps/statistics/histogram_controller.cpp
+++ b/apps/statistics/histogram_controller.cpp
@@ -42,7 +42,7 @@ const char * HistogramController::title() {
bool HistogramController::handleEvent(Ion::Events::Event event) {
assert(selectedSeriesIndex() >= 0);
- if (event == Ion::Events::OK) {
+ if (event == Ion::Events::OK || event == Ion::Events::EXE) {
stackController()->push(histogramParameterController());
return true;
}
diff --git a/ion/src/simulator/web/simulator.html b/ion/src/simulator/web/simulator.html
index 6a686c8de..f5514dacf 100644
--- a/ion/src/simulator/web/simulator.html
+++ b/ion/src/simulator/web/simulator.html
@@ -38,8 +38,8 @@ body.fullscreen .col-calculator {
a.action {
display: block;
- width: 3%;
- padding: 1% 2%;
+ width: 4%;
+ padding: 1.5% 3%;
border: 1px solid black;
border-radius: 100px;
cursor: pointer;
@@ -55,20 +55,6 @@ a.action svg {
display: block;
}
-.actions {
- position: absolute;
- bottom: 2%;
- text-align: left;
- left: 0;
- right: 0;
- margin-left: 20px; /* Center the buttons - compensate the 10px margin below */
-}
-
-.actions a {
- display: inline-block;
- margin-right: 10px;
-}
-
.calculator {
margin: 0 auto;
position: relative;
@@ -76,7 +62,7 @@ a.action svg {
text-align: left; }
.calculator > img {
/* Rely on the img content to set the dimensions */
- max-height: 100vh;
+ max-height: 92.0vh;
max-width: 100%;
display: block; }
.calculator .screen {
@@ -86,6 +72,18 @@ a.action svg {
width: 67.5%;
height: 26.3%;
border: 0 none; }
+ .calculator .actions {
+ position: absolute;
+ top: 94.0vh;
+ text-align: center;
+ left: 0;
+ right: 0;
+ margin-left: 20px; /* Center the buttons - compensate the 10px margin below */
+ }
+ .calculator .actions a {
+ display: inline-block;
+ margin-right: 10px;
+ }
.calculator .keyboard {
position: absolute;
top: 38.5%;
@@ -110,7 +108,7 @@ a.action svg {
position: absolute; }
.calculator .keyboard .nav .left {
top: 36%;
- left: 3%;
+ left: 2%;
width: 15%;
height: 28%; }
.calculator .keyboard .nav .right {
@@ -120,17 +118,17 @@ a.action svg {
height: 28%; }
.calculator .keyboard .nav .top {
top: 7%;
- left: 12.5%;
+ left: 12%;
width: 10%;
height: 40%; }
.calculator .keyboard .nav .bottom {
top: 53%;
- left: 12.5%;
+ left: 12%;
width: 10%;
height: 40%; }
.calculator .keyboard .nav .home {
- top: 12%;
- left: 42%;
+ top: 15%;
+ left: 41%;
width: 16%;
height: 33%; }
.calculator .keyboard .nav .power {
@@ -139,19 +137,19 @@ a.action svg {
width: 16%;
height: 33%; }
.calculator .keyboard .nav .ok {
- top: 30%;
- left: 68%;
+ top: 31%;
+ left: 67%;
width: 13%;
height: 38%; }
.calculator .keyboard .nav .back {
- top: 30%;
+ top: 31%;
left: 84%;
width: 13%;
height: 38%; }
.calculator .keyboard .functions {
position: absolute;
top: 26.75%;
- left: 1%;
+ left: 0.5%;
width: 98%; }
.calculator .keyboard .functions span {
margin: 1.7% 1%;
@@ -160,14 +158,14 @@ a.action svg {
padding-top: 10%; }
.calculator .keyboard .digits {
position: absolute;
- top: 57%;
+ top: 56.5%;
left: 0.5%;
width: 98%; }
.calculator .keyboard .digits span {
margin: 1.8% 2%;
width: 16%;
height: 0;
- padding-top: 11%; }
+ padding-top: 11.3%; }
@@ -230,20 +228,19 @@ a.action svg {
+
-
-