diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-28 22:14:24 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-28 22:14:24 +0800 |
| commit | d4f9daa631fa832d556c16f3a29eaf73bd849f32 (patch) | |
| tree | 7410d5e0d7516248e3e8a2e895d4d78f3ce82d0d /ethereal | |
| parent | 1eda1d25b0d27fe57287698fb883c9153ddda292 (diff) | |
| download | dexon-d4f9daa631fa832d556c16f3a29eaf73bd849f32.tar.gz dexon-d4f9daa631fa832d556c16f3a29eaf73bd849f32.tar.zst dexon-d4f9daa631fa832d556c16f3a29eaf73bd849f32.zip | |
Refactor hex encode and remove coupling of popup to main window
Diffstat (limited to 'ethereal')
| -rw-r--r-- | ethereal/assets/qml/wallet.qml | 3 | ||||
| -rw-r--r-- | ethereal/ui/ui_lib.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 82b680913..0e0e3d78d 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -342,8 +342,6 @@ ApplicationWindow { property var block width: root.width height: 240 - x: root.x - y: root.y + root.height Component{ id: blockDetailsDelegate Rectangle { @@ -442,6 +440,7 @@ ApplicationWindow { text: "Contract" anchors.top: contractLabel.bottom anchors.left: parent.left + anchors.bottom: popup.bottom wrapMode: Text.Wrap width: parent.width - 30 height: 80 diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 73ec67c86..9c4301ffe 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -2,7 +2,6 @@ package ethui import ( "bitbucket.org/kardianos/osext" - "encoding/hex" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" @@ -94,7 +93,7 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) { dbWindow := NewDebuggerWindow(self) object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash)) if len(object.Script()) > 0 { - dbWindow.SetCode("0x" + hex.EncodeToString(object.Script())) + dbWindow.SetCode("0x" + ethutil.Hex(object.Script())) } dbWindow.SetData(data) |