From 31bcc5a0a545e2b6e72733720cda7a3d883a51ba Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Fri, 22 Feb 2019 19:53:16 +0100
Subject: [PATCH] mol-plugin: fix assembly transform, UI wip
---
src/mol-plugin/skin/base/components/transformer.scss | 5 +++--
src/mol-plugin/state/transforms/model.ts | 1 -
src/mol-plugin/ui/state/common.tsx | 2 +-
src/mol-plugin/ui/state/tree.tsx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mol-plugin/skin/base/components/transformer.scss b/src/mol-plugin/skin/base/components/transformer.scss
index aca44d435..e753f8524 100644
--- a/src/mol-plugin/skin/base/components/transformer.scss
+++ b/src/mol-plugin/skin/base/components/transformer.scss
@@ -44,11 +44,12 @@
.msp-transform-header {
position: relative;
- border-top: 1px solid $entity-color-Behaviour; // TODO: separate color
+ // border-top: 1px solid $entity-color-Behaviour; // TODO: separate color
> button {
text-align: left;
- background: color-lower-contrast($default-background, 4%);
+ padding-left: $row-height;
+ background: $control-background; // color-lower-contrast($default-background, 4%);
font-weight: bold;
}
diff --git a/src/mol-plugin/state/transforms/model.ts b/src/mol-plugin/state/transforms/model.ts
index 4f67fc62c..d38308ddb 100644
--- a/src/mol-plugin/state/transforms/model.ts
+++ b/src/mol-plugin/state/transforms/model.ts
@@ -168,7 +168,6 @@ const StructureAssemblyFromModel = PluginStateTransform.BuiltIn({
return new SO.Molecule.Structure(base, label);
}
- asm = model.symmetry.assemblies[0];
id = asm.id;
const s = await StructureSymmetry.buildAssembly(base, id!).runInContext(ctx);
const props = { label: `Assembly ${id}`, description: structureDesc(s) };
diff --git a/src/mol-plugin/ui/state/common.tsx b/src/mol-plugin/ui/state/common.tsx
index a1d39c7e8..d6cc4c8f8 100644
--- a/src/mol-plugin/ui/state/common.tsx
+++ b/src/mol-plugin/ui/state/common.tsx
@@ -177,7 +177,7 @@ abstract class TransformContolBase<P, S extends TransformContolBase.ControlState
return <div className='msp-transform-wrapper'>
<div className='msp-transform-header'>
- <button className='msp-btn msp-btn-block' onClick={this.toggleExpanded}>{display.name}</button>
+ <button className='msp-btn msp-btn-block' onClick={this.toggleExpanded} title={display.description}>{display.name}</button>
{!isEmpty && !this.state.isCollapsed && <button className='msp-btn msp-btn-link msp-transform-default-params' onClick={this.setDefault} disabled={this.state.busy} style={{ float: 'right'}} title='Set default params'>↻</button>}
</div>
{!isEmpty && !this.state.isCollapsed && <>
diff --git a/src/mol-plugin/ui/state/tree.tsx b/src/mol-plugin/ui/state/tree.tsx
index 3859cb0a8..6b42be65b 100644
--- a/src/mol-plugin/ui/state/tree.tsx
+++ b/src/mol-plugin/ui/state/tree.tsx
@@ -222,7 +222,7 @@ class StateTreeNodeLabel extends PluginUIComponent<{ nodeRef: string, state: Sta
const row = <div className={`msp-tree-row${isCurrent ? ' msp-tree-row-current' : ''}`} onMouseEnter={this.highlight} onMouseLeave={this.clearHighlight}
style={{ marginLeft: this.state.isCurrent ? '0px' : `${this.props.depth * 10}px`, borderRadius: this.state.isCurrent ? '0' : void 0 }}>
- {isCurrent ? <b>{label}</b> : label}
+ {label}
{children.size > 0 && <button onClick={this.toggleExpanded} className='msp-btn msp-btn-link msp-tree-toggle-exp-button'>
<span className={`msp-icon msp-icon-${cellState.isCollapsed ? 'expand' : 'collapse'}`} />
</button>}
--
GitLab