Fix siemens self adaptive path
Fix user softkey scrolling
This commit is contained in:
@@ -26,13 +26,16 @@ namespace Step.NC
|
||||
|
||||
config.RadiusMetricType = (ToolManagerConfig.ToolMetricType == RADIUS_METRIC);
|
||||
|
||||
config.SelfAdaptivePathOptionActive = true;
|
||||
if (!ToolManagerConfig.SelfAdaptivePathOpt)
|
||||
config.SelfAdaptivePathOptionActive = false;
|
||||
|
||||
if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
|
||||
{
|
||||
// Setup options
|
||||
config.FamilyOptionActive = true;
|
||||
config.MultitoolOptionActive = true;
|
||||
config.OffsetOptionActive = true;
|
||||
config.SelfAdaptivePathOptionActive = true;
|
||||
|
||||
// Add categories to be removed
|
||||
List<string> categories = new List<string>();
|
||||
@@ -57,8 +60,6 @@ namespace Step.NC
|
||||
|
||||
if (!ToolManagerConfig.OffsetOpt)
|
||||
config.OffsetOptionActive = false;
|
||||
if (!ToolManagerConfig.SelfAdaptivePathOpt)
|
||||
config.SelfAdaptivePathOptionActive = false;
|
||||
|
||||
categories.Add("offset");
|
||||
|
||||
|
||||
@@ -466,7 +466,6 @@
|
||||
overflow: hidden;
|
||||
|
||||
span {
|
||||
display: inline-block;
|
||||
animation: marquee 3s linear infinite;
|
||||
}
|
||||
|
||||
@@ -479,6 +478,10 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.soft-key-title{
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
#nc-softkeys-container {
|
||||
|
||||
@@ -6249,7 +6249,6 @@ footer .container button.big:before {
|
||||
overflow: hidden;
|
||||
}
|
||||
.soft-key .horizontal-scroll span {
|
||||
display: inline-block;
|
||||
animation: marquee 3s linear infinite;
|
||||
}
|
||||
@keyframes marquee {
|
||||
@@ -6260,6 +6259,9 @@ footer .container button.big:before {
|
||||
transform: translate(-100%, 0);
|
||||
}
|
||||
}
|
||||
.soft-key .soft-key-title {
|
||||
display: inline-block;
|
||||
}
|
||||
#nc-softkeys-container {
|
||||
width: 312px;
|
||||
height: 216px;
|
||||
|
||||
@@ -2,10 +2,14 @@
|
||||
<div
|
||||
class="soft-key"
|
||||
ref="sk"
|
||||
@mouseover="onMouseOver"
|
||||
@mouseout="onMouseDown"
|
||||
:class="{'notVisible': !visible, menuopened: (menuOpened && visible), disabled: (disabled && visible), selected: (selected && visible)}"
|
||||
@click="selectedItem()"
|
||||
>
|
||||
<header v-if="visible">{{title}}</header>
|
||||
>
|
||||
<header :class="{'horizontal-scroll': mouseOver}" v-if="visible">
|
||||
<span class="soft-key-title" ref="longTitle" :style="{'animation-duration': duration +'s'}">{{title}}</span>
|
||||
</header>
|
||||
<div class="box-check" v-if="selected && visible">
|
||||
<div class="check"></div>
|
||||
</div>
|
||||
@@ -55,6 +59,12 @@ export default {
|
||||
selected: { default: false },
|
||||
confirmationNeeded: { default: false },
|
||||
visible: { default: false }
|
||||
},
|
||||
data: function() {
|
||||
return {
|
||||
mouseOver: false,
|
||||
duration: 2
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
keys() {
|
||||
@@ -117,6 +127,16 @@ export default {
|
||||
},
|
||||
selectedItem: function() {
|
||||
this.$emit("selectedItem");
|
||||
},
|
||||
onMouseOver(){
|
||||
if(this.$refs.longTitle.clientWidth > 184 ) {
|
||||
this.duration = this.title.length / 10
|
||||
this.mouseOver = true
|
||||
}
|
||||
},
|
||||
onMouseDown(){
|
||||
if(this.mouseOver)
|
||||
this.mouseOver = false
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
@click="selectedItem()"
|
||||
>
|
||||
<header :class="{'horizontal-scroll': mouseOver}" v-if="visible">
|
||||
<span :style="{'animation-duration': duration +'s'}">{{title}}</span>
|
||||
<span class="soft-key-title" ref="longTitle" :style="{'animation-duration': duration +'s'}">{{title}}</span>
|
||||
</header>
|
||||
<div class="box-check" v-if=" selected && visible">
|
||||
<div class="check"></div>
|
||||
@@ -68,7 +68,7 @@ export default {
|
||||
this.$emit("selectedItem");
|
||||
},
|
||||
onMouseOver(){
|
||||
if(this.title.length > 26) {
|
||||
if(this.$refs.longTitle.clientWidth > 184 ) {
|
||||
this.duration = this.title.length / 10
|
||||
this.mouseOver = true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user