Merge pull request #5283 from ethereum/minordesktopupdates

minor updates desktop
pull/5292/head
bunsenstraat 4 weeks ago committed by GitHub
commit e08965b27f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx
  2. 2
      apps/remixdesktop/package.json
  3. 19
      apps/remixdesktop/src/main.ts
  4. 6
      apps/remixdesktop/test/tests/app/search.test.ts

@ -138,7 +138,7 @@ export class TemplatesSelectionPlugin extends ViewPlugin {
<RemixUIGridView <RemixUIGridView
plugin={this} plugin={this}
styleList={""} styleList={""}
logo='/assets/img/bgRemi.webp' logo='assets/img/bgRemi.webp'
enableFilter={true} enableFilter={true}
showUntagged={true} showUntagged={true}
showPin={false} showPin={false}

@ -1,6 +1,6 @@
{ {
"name": "remixdesktop", "name": "remixdesktop",
"version": "1.0.8-insiders", "version": "1.0.9-insiders",
"main": "build/main.js", "main": "build/main.js",
"license": "MIT", "license": "MIT",
"type": "commonjs", "type": "commonjs",

@ -34,10 +34,19 @@ const homeDir = app.getPath('userData')
const windowSet = new Set<BrowserWindow>([]); const windowSet = new Set<BrowserWindow>([]);
export const createWindow = async (dir?: string): Promise<void> => { export const createWindow = async (dir?: string): Promise<void> => {
// reize factor
let resizeFactor = 0.8
// if the window is too small the size is 100%
if( screen.getPrimaryDisplay().size.width < 2560 || screen.getPrimaryDisplay().size.height < 1440) {
resizeFactor = 1
}
const width = screen.getPrimaryDisplay().size.width * resizeFactor
const height = screen.getPrimaryDisplay().size.height * resizeFactor
// Create the browser window. // Create the browser window.
const mainWindow = new BrowserWindow({ const mainWindow = new BrowserWindow({
width: (isE2E ? 2560 : screen.getPrimaryDisplay().size.width * 0.8), width: (isE2E ? 2560 : width),
height: (isE2E ? 1140 : screen.getPrimaryDisplay().size.height * 0.8), height: (isE2E ? 1140 : height),
frame: true, frame: true,
webPreferences: { webPreferences: {
preload: path.join(__dirname, 'preload.js') preload: path.join(__dirname, 'preload.js')
@ -100,12 +109,10 @@ app.on('activate', () => {
}); });
const showAbout = () => { const showAbout = () => {
void dialog.showMessageBox({ void dialog.showMessageBox({
title: `About Remix`, title: `About Remix`,
message: `Remix`, message: `The Native IDE for Web3 Development.`,
detail: `Remix`, detail: `Remix Desktop version ${app.getVersion()}`,
buttons: [], buttons: [],
}); });
}; };

@ -47,7 +47,7 @@ module.exports = {
.waitForElementContainsText('*[data-id="search_results"]', 'sender.voted') .waitForElementContainsText('*[data-id="search_results"]', 'sender.voted')
.waitForElementContainsText('*[data-id="search_results"]', 'read') .waitForElementContainsText('*[data-id="search_results"]', 'read')
.elements('css selector', '.search_plugin_search_line', (res) => { .elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 6) Array.isArray(res.value) && browser.assert.equal(res.value.length, 7)
}) })
}, 'Should find text with exclude #group1': function (browser: NightwatchBrowser) { }, 'Should find text with exclude #group1': function (browser: NightwatchBrowser) {
browser browser
@ -56,7 +56,7 @@ module.exports = {
.clearValue('*[id="search_include"]').pause(2000) .clearValue('*[id="search_include"]').pause(2000)
.setValue('*[id="search_include"]', '**').sendKeys('*[id="search_include"]', browser.Keys.ENTER).pause(4000) .setValue('*[id="search_include"]', '**').sendKeys('*[id="search_include"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => { .elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 62) Array.isArray(res.value) && browser.assert.equal(res.value.length, 63)
}) })
.setValue('*[id="search_exclude"]', ',contracts/**').sendKeys('*[id="search_exclude"]', browser.Keys.ENTER).pause(4000) .setValue('*[id="search_exclude"]', ',contracts/**').sendKeys('*[id="search_exclude"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => { .elements('css selector', '.search_plugin_search_line', (res) => {
@ -101,7 +101,7 @@ module.exports = {
.clearValue('*[id="search_input"]') .clearValue('*[id="search_input"]')
.setValue('*[id="search_input"]', 'contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(4000) .setValue('*[id="search_input"]', 'contract').sendKeys('*[id="search_input"]', browser.Keys.ENTER).pause(4000)
.elements('css selector', '.search_plugin_search_line', (res) => { .elements('css selector', '.search_plugin_search_line', (res) => {
Array.isArray(res.value) && browser.assert.equal(res.value.length, 15) Array.isArray(res.value) && browser.assert.equal(res.value.length, 16)
}) })
}, },
'Should replace text #group1': function (browser: NightwatchBrowser) { 'Should replace text #group1': function (browser: NightwatchBrowser) {

Loading…
Cancel
Save