Merge branch 'develop' into 397---windows-icon-generation

CONTRIBUTORS.md

@@ -27,4 +27,3 @@ Wails is what it is because of the time and effort given by these great people.
   * [Jarek](https://github.com/Jarek-SRT)
   * [Konez2k](https://github.com/konez2k)
   * [msms](https://github.com/sayuthisobri)
-  * [dedo1911](https://github.com/dedo1911)

README.md

@@ -55,7 +55,7 @@ _Debian: 8, 9, 10_
 
 _Ubuntu: 16.04, 18.04, 19.04_
 
-_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS
+_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_
 
 #### Arch Linux / ArchLabs
 

cmd/linux.go

@@ -59,10 +59,6 @@ const (
 	Leap
 	// ArchLabs distribution
 	ArchLabs
-	// PopOS distribution
-	PopOS
-	// Solus distribution
-	Solus
 )
 
 // DistroInfo contains all the information relating to a linux distribution
@@ -163,10 +159,6 @@ func parseOsRelease(osRelease string) *DistroInfo {
 		result.Distribution = Tumbleweed
 	case "opensuse-leap":
 		result.Distribution = Leap
-	case "pop":
-		result.Distribution = PopOS
-	case "solus":
-		result.Distribution = Solus
 	default:
 		result.Distribution = Unknown
 	}
@@ -203,17 +195,6 @@ func DpkgInstalled(packageName string) (bool, error) {
 	return exitCode == 0, nil
 }
 
-// EOpkgInstalled uses dpkg to see if a package is installed
-func EOpkgInstalled(packageName string) (bool, error) {
-	program := NewProgramHelper()
-	eopkg := program.FindProgram("eopkg")
-	if eopkg == nil {
-		return false, fmt.Errorf("cannot check dependencies: eopkg not found")
-	}
-	stdout, _, _, _ := eopkg.Run("info", packageName)
-	return strings.HasPrefix(stdout, "Installed"), nil
-}
-
 // PacmanInstalled uses pacman to see if a package is installed.
 func PacmanInstalled(packageName string) (bool, error) {
 	program := NewProgramHelper()
@@ -285,9 +266,5 @@ func RequestSupportForDistribution(distroInfo *DistroInfo) error {
 
 	fmt.Println("Opening browser to file request.")
 	browser.OpenURL(fullURL + url.PathEscape(params))
-	result = Prompt("We have a guide for adding support for your distribution. Would you like to view it?", "yes")
-	if strings.ToLower(result) == "yes" {
-		browser.OpenURL("https://wails.app/guides/distro/")
-	}
 	return nil
 }

cmd/linuxdb.yaml

@@ -28,15 +28,6 @@ distributions:
         gccversioncommand: &gccdumpfullversion -dumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-  pop:
-    id: pop
-    releases:
-      default:
-        version: default
-        name: Pop!_OS
-        gccversioncommand: &gccdumpfullversion -dumpfullversion
-        programs: *debiandefaultprograms
-        libraries: *debiandefaultlibraries
   kali:
     id: kali
     releases:
@@ -241,25 +232,6 @@ distributions:
         gccversioncommand: *gccdumpfullversion
         programs: *debiandefaultprograms
         libraries: *debiandefaultlibraries
-  solus:
-    id: solus
-    releases:
-      default:
-        version: default
-        name: Solus
-        gccversioncommand: *gccdumpfullversion
-        programs: &solusdefaultprograms
-          - name: gcc
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: pkg-config
-            help: Please install with `sudo eopkg it -c system.devel` and try again
-          - name: npm
-            help: Please install with `sudo eopkg it nodejs` and try again
-        libraries: &solusdefaultlibraries
-          - name: libgtk-3-devel
-            help: Please install with `sudo eopkg it libgtk-3-devel` and try again
-          - name: libwebkit-gtk-devel
-            help: Please install with `sudo eopkg it libwebkit-gtk-devel` and try again
         
   opensuse-tumbleweed:
     id: opensuse-tumbleweed

cmd/package.go

@@ -16,8 +16,9 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/jackmordaunt/icns"
 	"golang.org/x/image/draw"
+
+	"github.com/jackmordaunt/icns"
 )
 
 // PackageHelper helps with the 'wails package' command
@@ -59,107 +60,83 @@ func newPlistData(title, exe, packageID, version, author string) *plistData {
 	}
 }
 
-type windowsIcoHeader struct {
+type windowsIconHeader struct {
 	_          uint16
 	imageType  uint16
 	imageCount uint16
-}
-
-type windowsIcoDescriptor struct {
-	width   uint8
-	height  uint8
-	colours uint8
-	_       uint8
-	planes  uint16
-	bpp     uint16
-	size    uint32
-	offset  uint32
-}
-
-type windowsIcoContainer struct {
-	Header windowsIcoDescriptor
-	Data   []byte
+	width      uint8
+	height     uint8
+	colours    uint8
+	_          uint8
+	planes     uint16
+	bpp        uint16
+	size       uint32
+	offset     uint32
 }
 
 func generateWindowsIcon(pngFilename string, iconfile string) error {
-	sizes := []int{256, 128, 64, 48, 32, 16}
+	header := &windowsIconHeader{
+		imageType:  1,
+		imageCount: 1,
+		bpp:        32,
+		planes:     1,
+		offset:     22,
+		width:      0,
+		height:     0,
+	}
 
+	// Load png
 	pngfile, err := os.Open(pngFilename)
 	if err != nil {
 		return err
 	}
 	defer pngfile.Close()
 
+	// Decode to internal image
 	pngdata, err := png.Decode(pngfile)
 	if err != nil {
 		return err
 	}
 
-	icons := []windowsIcoContainer{}
+	// Scale to 256*256
+	rect := image.Rect(0, 0, 255, 255)
+	rawdata := image.NewRGBA(rect)
+	scale := draw.ApproxBiLinear
+	scale.Scale(rawdata, rect, pngdata, pngdata.Bounds(), draw.Over, nil)
 
-	for _, size := range sizes {
-		rect := image.Rect(0, 0, int(size), int(size))
-		rawdata := image.NewRGBA(rect)
-		scale := draw.CatmullRom
-		scale.Scale(rawdata, rect, pngdata, pngdata.Bounds(), draw.Over, nil)
-
-		icondata := new(bytes.Buffer)
-		writer := bufio.NewWriter(icondata)
-		err = png.Encode(writer, rawdata)
-		if err != nil {
-			return err
-		}
-		writer.Flush()
-
-		imgSize := size
-		if imgSize >= 256 {
-			imgSize = 0
-		}
-
-		data := icondata.Bytes()
-
-		icn := windowsIcoContainer{
-			Header: windowsIcoDescriptor{
-				width:  uint8(imgSize),
-				height: uint8(imgSize),
-				planes: 1,
-				bpp:    32,
-				size:   uint32(len(data)),
-			},
-			Data: data,
-		}
-		icons = append(icons, icn)
+	// Convert back to PNG
+	icondata := new(bytes.Buffer)
+	writer := bufio.NewWriter(icondata)
+	err = png.Encode(writer, rawdata)
+	if err != nil {
+		return err
+	}
+	err = writer.Flush()
+	if err != nil {
+		return err
 	}
 
-	outfile, err := os.Create(iconfile)
+	// Save size of PNG data
+	header.size = uint32(len(icondata.Bytes()))
+
+	// Open icon file for writing
+	outfilename := filepath.Join(filepath.Dir(pngFilename), iconfile)
+	outfile, err := os.Create(outfilename)
 	if err != nil {
 		return err
 	}
 	defer outfile.Close()
 
-	ico := windowsIcoHeader{
-		imageType:  1,
-		imageCount: uint16(len(sizes)),
-	}
-	err = binary.Write(outfile, binary.LittleEndian, ico)
+	// Write out the header
+	err = binary.Write(outfile, binary.LittleEndian, header)
 	if err != nil {
 		return err
 	}
 
-	offset := uint32(6 + 16*len(sizes))
-	for _, icon := range icons {
-		icon.Header.offset = offset
-		err = binary.Write(outfile, binary.LittleEndian, icon.Header)
-		if err != nil {
-			return err
-		}
-		offset += icon.Header.size
-	}
-	for _, icon := range icons {
-		_, err = outfile.Write(icon.Data)
-		if err != nil {
-			return err
-		}
+	// Write out the image data
+	_, err = outfile.Write(icondata.Bytes())
+	if err != nil {
+		return err
 	}
 	return nil
 }

cmd/packages/windows/wails.rc

@@ -1,2 +1,2 @@
 100 ICON    "$NAME$.ico"
-110 24      "$NAME$.exe.manifest"
+100 24      "$NAME$.exe.manifest"

cmd/system.go

@@ -274,7 +274,7 @@ func CheckDependencies(logger *Logger) (bool, error) {
 		distroInfo := GetLinuxDistroInfo()
 
 		switch distroInfo.Distribution {
-		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian, PopOS:
+		case Ubuntu, Debian, Zorin, Parrot, Linuxmint, Elementary, Kali, Neon, Deepin, Raspbian:
 			libraryChecker = DpkgInstalled
 		case Arch, ArcoLinux, ArchLabs, Manjaro, ManjaroARM:
 			libraryChecker = PacmanInstalled
@@ -284,8 +284,6 @@ func CheckDependencies(logger *Logger) (bool, error) {
 			libraryChecker = EqueryInstalled
 		case VoidLinux:
 			libraryChecker = XbpsInstalled
-		case Solus:
-			libraryChecker = EOpkgInstalled
 		default:
 			return false, RequestSupportForDistribution(distroInfo)
 		}

cmd/version.go

@@ -1,4 +1,4 @@
 package cmd
 
 // Version - Wails version
-const Version = "v1.6.0-pre3"
+const Version = "v1.6.0-pre2"

lib/renderer/webview/webview.h

@@ -1410,8 +1410,6 @@ struct webview_priv
     wc.hInstance = hInstance;
     wc.lpfnWndProc = wndproc;
     wc.lpszClassName = classname;
-    wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(100));
-    wc.hIconSm = LoadIcon(hInstance, MAKEINTRESOURCE(100));
     RegisterClassEx(&wc);
 
     style = WS_OVERLAPPEDWINDOW;